xqtc/nixos-config
1
0
Fork 0
mirror of https://git.gay/xqtc/nixos-config synced 2024-11-22 15:30:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of git.sr.ht:~xqtc/nixos-config

Browse source
This commit is contained in:
xqtc161 2024-04-19 21:19:33 +02:00
parent 780fd73e98 634fac70f0
commit e16691ac75
12 changed files with 134 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/default.nix
View file

@ -14,6 +14,12 @@
# xdg-desktop-portal-hyprland # xdg-desktop-portal-hyprland
# xdg-desktop-portal # xdg-desktop-portal
# ]; # ];
programs.nh = {
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/home/xqtc/nixos-config";
};
networking.firewall.allowedTCPPorts = [8384 22000]; networking.firewall.allowedTCPPorts = [8384 22000];
networking.firewall.allowedUDPPorts = [22000 21027]; networking.firewall.allowedUDPPorts = [22000 21027];
nix.settings = { nix.settings = {

6
common/syncthing.nix
View file

@ -8,11 +8,13 @@
enable = true; enable = true;
user = "xqtc"; user = "xqtc";
dataDir = "/home/xqtc/syncthing"; dataDir = "/home/xqtc/syncthing";
overrideDevices = false;
overrideFolders = false;
configDir = "${config.services.syncthing.dataDir}/.config/syncthing"; configDir = "${config.services.syncthing.dataDir}/.config/syncthing";
settings = { settings = {
gui = { gui = {
user = "xqtc"; user = "xqtc";
# insecureSkipHostcheck = true; # insecureSkipHostcheck = true;
}; };
}; };
}; };

83
flake.lock
View file

@ -49,11 +49,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1712989815, "lastModified": 1713454118,
"narHash": "sha256-RWP/TMdNnDfOnhK3CMDxezX9L+bALjqvnZXY16EvtA0=", "narHash": "sha256-DboRJFHCs1DO8KjUTenVGcl65vlmDDB2pZVE5NMUHtg=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "612713b8c55be97af5b4ff75ab5f427fde25328c", "rev": "dcc97056067a707b885707c9a15fb96859da4b8f",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -245,11 +245,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713019815, "lastModified": 1713453913,
"narHash": "sha256-jzTo97VeKMNfnKw3xU+uiU5C7wtnLudsbwl/nwPLC7s=", "narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8fdf329526f06886b53b94ddf433848a0d142984", "rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +267,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712759992, "lastModified": 1712989663,
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,6 +280,24 @@
"type": "github" "type": "github"
} }
}, },
"nh": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1713422373,
"narHash": "sha256-PuGzau2Wj0T8MC3V8a41rc/sXT0DrNz1Ow/ApR6a87s=",
"owner": "viperML",
"repo": "nh",
"rev": "c9cb03418dc782701ada556a49a9e8de0b415fbc",
"type": "github"
},
"original": {
"owner": "viperML",
"repo": "nh",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -303,11 +321,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1712909959, "lastModified": 1713441075,
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "narHash": "sha256-3GGeFsEO8ivD+TcDEqe4s/d0VLvMYGNDGtx0ZnBxkUs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "rev": "6f976e53752e5b9ab08f9a3b1b0b9c67815c9754",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,11 +353,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1713032949, "lastModified": 1713459744,
"narHash": "sha256-WZR0/LpLkSsajw9uFwUCEWBA9QtWWRRBNScnvwjJHCM=", "narHash": "sha256-xdfSUKjXDQSvTLKReRPckLp0DcxVAQKrx4r/BwdA06g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44f5a5f39c795cf7a2281529e732b0dcd9427140", "rev": "1b7469ab47f305667f4da1af1e70b2577474d77c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +385,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1712791164, "lastModified": 1711668574,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1713248628,
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,7 +415,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1686020360, "lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
@ -410,11 +444,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1713008785, "lastModified": 1713294906,
"narHash": "sha256-fblaj6/83OQYrD1UHBjLapxjGQaC4edouX4g2X8CVhk=", "narHash": "sha256-xJJZdCBzVFpVppaYyUK4lTTNOnbAxrjhodoJL3Oi91E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "21c233919d747d3375e3a173b65f7f26ccf01256", "rev": "514a51877df9fe41ffc38c5237e3c4e5327e7607",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,8 +491,9 @@
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"nh": "nh",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixvim": "nixvim", "nixvim": "nixvim",
"spicetify-nix": "spicetify-nix" "spicetify-nix": "spicetify-nix"
@ -483,7 +518,7 @@
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1704167711, "lastModified": 1704167711,

2
flake.nix
View file

@ -9,6 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
spicetify-nix.url = "github:the-argus/spicetify-nix"; spicetify-nix.url = "github:the-argus/spicetify-nix";
nh.url = "github:/viperML/nh";
}; };
#inputs.agenix.url = "github:ryantm/agenix"; #inputs.agenix.url = "github:ryantm/agenix";
inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
@ -29,6 +30,7 @@
home-manager, home-manager,
nixos-hardware, nixos-hardware,
nixvim, nixvim,
nh,
... ...
}: let }: let
lib = nixpkgs.lib; lib = nixpkgs.lib;

18
home/modules/firefox.nix
View file

@ -21,7 +21,7 @@ with inputs; {
leechblock-ng leechblock-ng
darkreader darkreader
stylus stylus
violentmonkey violentmonkey
vimium-c vimium-c
noscript noscript
]; ];
@ -83,6 +83,22 @@ with inputs; {
definedAliases = ["@no"]; definedAliases = ["@no"];
}; };
"Nix Dev" = {
urls = [
{
template = "https://nix.dev/search.html";
params = [
{
name = "q";
value = "{searchTerms}";
}
];
}
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = ["@nd"];
};
"NixOS Wiki" = { "NixOS Wiki" = {
urls = [ urls = [
{ {

19
home/modules/gtk.nix
View file

@ -16,8 +16,8 @@
enabled-extensions = [ enabled-extensions = [
"user-theme@gnome-shell-extensions.gcampax.github.com" "user-theme@gnome-shell-extensions.gcampax.github.com"
"trayIconsReloaded@selfmade.pl" "trayIconsReloaded@selfmade.pl"
"burn-my-windows@schneegans.github.com" "burn-my-windows@schneegans.github.com"
"desktop-cube@schneegans.github.com" "desktop-cube@schneegans.github.com"
"Vitals@CoreCoding.com" "Vitals@CoreCoding.com"
"dash-to-panel@jderose9.github.com" "dash-to-panel@jderose9.github.com"
# "blur-my-shell@aunetx" # "blur-my-shell@aunetx"
@ -64,12 +64,11 @@
gnomeExtensions.desktop-cube gnomeExtensions.desktop-cube
catppuccin-cursors.mochaPink catppuccin-cursors.mochaPink
]; ];
# home.pointerCursor = { # home.pointerCursor = {
# gtk.enable = true; # gtk.enable = true;
# x11.enable = true; # x11.enable = true;
# name = "Catppuccin-Mocha-Pink-Cursors"; # name = "Catppuccin-Mocha-Pink-Cursors";
# package = pkgs.catppuccin-cursors.mochaPink; # package = pkgs.catppuccin-cursors.mochaPink;
# # size = 24; # # size = 24;
# }; # };
} }

9
home/modules/home-pkgs.nix
View file

@ -10,6 +10,7 @@
pkgs.steam pkgs.steam
pkgs.protonup-qt pkgs.protonup-qt
pkgs.via pkgs.via
pkgs.telegram-desktop
# pkgs.spotify # pkgs.spotify
] ]
else []; else [];
@ -19,18 +20,22 @@ in {
home.packages = home.packages =
[ [
pkgs.neofetch pkgs.neofetch
pkgs.uwufetch # pkgs.uwufetch
maxfetch maxfetch
pkgs.btop pkgs.btop
pkgs.iftop pkgs.iftop
pkgs.ranger pkgs.ranger
pkgs.openvpn
pkgs.moodle-dl pkgs.moodle-dl
pkgs.anki pkgs.anki
pkgs.obsidian pkgs.obsidian
pkgs.syncthingtray
pkgs.brightnessctl pkgs.brightnessctl
pkgs.pavucontrol pkgs.pavucontrol
@ -50,7 +55,6 @@ in {
pkgs.signal-desktop pkgs.signal-desktop
pkgs.vesktop pkgs.vesktop
pkgs.telegram-desktop
pkgs.element-desktop pkgs.element-desktop
pkgs.qbittorrent pkgs.qbittorrent
@ -62,6 +66,7 @@ in {
pkgs.neovide pkgs.neovide
pkgs.xournalpp pkgs.xournalpp
pkgs.zathura
pkgs.ripgrep pkgs.ripgrep

1
home/modules/rofi.nix
View file

@ -7,6 +7,7 @@
}: { }: {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland;
extraConfig = { extraConfig = {
terminal = "wezterm"; terminal = "wezterm";
disable-history = false; disable-history = false;

10
hosts/aarch64-linux/alastor/default.nix
View file

@ -113,6 +113,11 @@
wl-clipboard wl-clipboard
xclip xclip
sway
swaylock-effects
wmenu
foot
gnomeExtensions.appindicator gnomeExtensions.appindicator
gnomeExtensions.tray-icons-reloaded gnomeExtensions.tray-icons-reloaded
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
@ -121,6 +126,7 @@
jellyfin-web jellyfin-web
jellyfin-ffmpeg jellyfin-ffmpeg
]; ];
security.pam.services.swaylock = {};
services.udev.packages = with pkgs; [gnome.gnome-settings-daemon]; services.udev.packages = with pkgs; [gnome.gnome-settings-daemon];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@ -141,8 +147,8 @@
services.openssh.enable = true; services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [22]; networking.firewall.allowedTCPPorts = [22 2234];
# networking.firewall.allowedUDPPorts = [ ... ]; networking.firewall.allowedUDPPorts = [2234];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;

2
hosts/aarch64-linux/alastor/hardware-configuration.nix
View file

@ -30,7 +30,7 @@
swapDevices = [ swapDevices = [
{ {
device = "/var/lib/swapfile"; device = "/var/lib/swapfile";
size = 8 * 1024; size = 12 * 1024;
} }
]; ];

15
hosts/x86_64-linux/beleth/default.nix
View file

@ -13,6 +13,7 @@ with lib; {
./calibre-web.nix ./calibre-web.nix
./transmission.nix ./transmission.nix
./lanrarari.nix ./lanrarari.nix
./uptime.nix
../../gc.nix ../../gc.nix
../../../common ../../../common
]; ];
@ -22,7 +23,11 @@ with lib; {
email = "xqtc@tutanota.com"; email = "xqtc@tutanota.com";
configFile = pkgs.writeText "Caddyfile" '' configFile = pkgs.writeText "Caddyfile" ''
heroin.trade { heroin.trade {
root * /var/www/website/build/ root * /var/www/website/public/
handle_errors {
rewrite * /404.html
file_server
}
file_server file_server
} }
syncthing.heroin.trade { syncthing.heroin.trade {
@ -43,6 +48,9 @@ with lib; {
grafana.heroin.trade { grafana.heroin.trade {
reverse_proxy http://127.0.0.1:2342 reverse_proxy http://127.0.0.1:2342
} }
uptime.heroin.trade {
reverse_proxy 127.0.0.1:3001
}
''; '';
}; };
@ -87,11 +95,16 @@ with lib; {
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus"
]; ];
programs.bash.blesh.enable = true;
# programs.bash.shellInit = "cd /home/xqtc/nixos-config/; export GIT_REVISION_CONFIG=$(nix flake metadata --json | jq -r '.locked.rev'); echo $GIT_REVISION_CONFIG; cd;";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim neovim
vim vim
git git
wget wget
jq
zola
]; ];
programs.mtr.enable = true; programs.mtr.enable = true;

6
hosts/x86_64-linux/beleth/uptime.nix Normal file
View file

@ -0,0 +1,6 @@
{config, lib, ...}:
{
services.uptime-kuma = {
enable = true;
};
}