xun/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lots of stuff

Browse source
This commit is contained in:
xunuwu 2024-06-26 20:49:16 +02:00
parent 30bd03615f
commit 1ed9ce6864
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
30 changed files with 223 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
result result
.direnv .direnv
.swp

159
flake.lock generated
View file

@ -55,6 +55,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
@ -82,11 +98,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714641030, "lastModified": 1717285511,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,21 +166,55 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "git-hooks": {
"inputs": { "inputs": {
"systems": "systems_2" "flake-compat": "flake-compat_3",
"gitignore": "gitignore",
"nixpkgs": [
"small-nvim",
"neovim-nightly-overlay",
"nixpkgs"
],
"nixpkgs-stable": [
"small-nvim",
"neovim-nightly-overlay",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1717664902,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
"owner": "numtide", "owner": "cachix",
"repo": "flake-utils", "repo": "git-hooks.nix",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "cachix",
"repo": "flake-utils", "repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"small-nvim",
"neovim-nightly-overlay",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github" "type": "github"
} }
}, },
@ -193,11 +243,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713898448, "lastModified": 1718018037,
"narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,45 +276,21 @@
"type": "github" "type": "github"
} }
}, },
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"small-nvim",
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1715815279,
"narHash": "sha256-Pf7ZlqPnr195NZb5ADzMVsXurPMjRZ+JMXf6JxvXArE=",
"owner": "neovim",
"repo": "neovim",
"rev": "9ca81b025990911c2a0dbda92af39ba84983bac3",
"type": "github"
},
"original": {
"dir": "contrib",
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake", "neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1715817852, "lastModified": 1718512978,
"narHash": "sha256-UH5o7hT72oAavJTG2NxlpMyQe3BQMniQAsgTugWtlc4=", "narHash": "sha256-roENt8tYPxBXcaluvburPG9PeKhr4BgoYup2LR66wvA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "7b5ca2486bba58cac80b9229209239740b67cf90", "rev": "c1e57fe1d1172672adae8633286d5d7713309ccf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,6 +299,22 @@
"type": "github" "type": "github"
} }
}, },
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1718492826,
"narHash": "sha256-YaZyuhBSZFnwoMwe790NjzUyff/Ml93jJ6wxj4dCFdc=",
"owner": "neovim",
"repo": "neovim",
"rev": "aa319da4024a77b0f7c40e08c6f5d5b512a7f899",
"type": "github"
},
"original": {
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -375,11 +417,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1715774670, "lastModified": 1718276985,
"narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=", "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3fcfcfabd01b947a1e4f36622bbffa3985bdac6", "rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,11 +469,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1718250206, "lastModified": 1719105734,
"narHash": "sha256-FcTPBqDk3Fut84G9gPRzKbDfYsBKp6k68x7l0gpoaG4=", "narHash": "sha256-Sa2qKc985UTUA7gJ15eb6CjOYwAqfMmL3f0uVnKNzeQ=",
"owner": "xunuwu", "owner": "xunuwu",
"repo": "small-nvim", "repo": "small-nvim",
"rev": "80e1ddb44caecdc62a9239fb0a7ce5b315ac3c72", "rev": "d71d15304a37db9b9ef712f03a4ec7928dfb9783",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -489,24 +531,9 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,

6
flake.nix
View file

@ -11,11 +11,7 @@
]; ];
flake = { flake = {
}; };
perSystem = { perSystem = {pkgs, ...}: {
pkgs,
system,
...
}: {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
alejandra alejandra

1
home/develop/default.nix
View file

@ -1,5 +1,6 @@
{ {
imports = [ imports = [
./nix.nix ./nix.nix
./docs.nix
]; ];
} }

3
home/develop/docs.nix Normal file
View file

@ -0,0 +1,3 @@
{
programs.man.generateCaches = true;
}

8
home/profiles/default.nix
View file

@ -13,9 +13,11 @@
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
{ {
programs.nix-index.enableZshIntegration = false; programs.nix-index = {
programs.nix-index.enableBashIntegration = false; enableBashIntegration = false;
programs.nix-index.enableFishIntegration = false; enableFishIntegration = false;
enableZshIntegration = false;
};
} }
]; ];
"xun@hopper" = [ "xun@hopper" = [

3
home/profiles/nixdesk/default.nix
View file

@ -1,4 +1,4 @@
{...}: { {
imports = [ imports = [
./kanshi.nix ./kanshi.nix
./defaults.nix ./defaults.nix
@ -7,6 +7,7 @@
../../terminal ../../terminal
../../terminal/programs/zellij.nix ../../terminal/programs/zellij.nix
../../terminal/programs/irssi.nix
../../terminal/programs/lazygit.nix ../../terminal/programs/lazygit.nix
../../terminal/programs/beets.nix ../../terminal/programs/beets.nix
../../editors/nvim.nix ../../editors/nvim.nix

2
home/programs/browsers/firefox.nix
View file

@ -21,7 +21,7 @@
]; ];
bookmarks = {}; bookmarks = {};
settings = { settings = {
"browser.tabs.inTitleBar" = "0"; # use system title bar (if you have one :)) "browser.tabs.inTitleBar" = "0"; # use system title bar
"browser.newtabpage.enabled" = false; "browser.newtabpage.enabled" = false;
"browser.newtab.url" = "about:blank"; "browser.newtab.url" = "about:blank";
"general.autoScroll" = "true"; # mmb scroll mode "general.autoScroll" = "true"; # mmb scroll mode

5
home/programs/desktop/awesome/default.nix
View file

@ -1,9 +1,4 @@
{pkgs, ...}: { {pkgs, ...}: {
services.picom = {
enable = true;
vSync = true;
};
xsession.windowManager.awesome = { xsession.windowManager.awesome = {
enable = true; enable = true;
noArgb = true; noArgb = true;

5
home/programs/desktop/sway/default.nix
View file

@ -34,6 +34,10 @@
statusCommand = "${lib.getExe pkgs.i3status}"; statusCommand = "${lib.getExe pkgs.i3status}";
} }
]; ];
window = {
titlebar = false;
};
menu = "${lib.getExe pkgs.fuzzel}";
keybindings = let keybindings = let
mod = config.wayland.windowManager.sway.config.modifier; mod = config.wayland.windowManager.sway.config.modifier;
wobVolume = "${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_SINK@ | awk '{print $2*100}' > $XDG_RUNTIME_DIR/wob.sock"; wobVolume = "${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_SINK@ | awk '{print $2*100}' > $XDG_RUNTIME_DIR/wob.sock";
@ -56,7 +60,6 @@
"${mod}+Ctrl+Shift+${dir.up}" = "move output up"; "${mod}+Ctrl+Shift+${dir.up}" = "move output up";
"${mod}+Ctrl+Shift+${dir.down}" = "move output down"; "${mod}+Ctrl+Shift+${dir.down}" = "move output down";
"${mod}+d" = "exec ${lib.getExe pkgs.fuzzel}";
"${mod}+Shift+Backspace" = "exec systemctl suspend"; "${mod}+Shift+Backspace" = "exec systemctl suspend";
"${mod}+Shift+s" = "exec ${lib.getExe pkgs.grimblast} copy area"; "${mod}+Shift+s" = "exec ${lib.getExe pkgs.grimblast} copy area";

1
home/programs/media/jellyfin.nix
View file

@ -1,7 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
jellyfin-media-player jellyfin-media-player
sonixd
feishin feishin
]; ];
} }

6
home/secrets/wakatime
View file

@ -1,5 +1,5 @@
{ {
"data": "ENC[AES256_GCM,data:C2L6jTyiwlFwW8Ss0oHcs+Uq/Lt+y7eo9+7OqU5+GRgqzsMNUzTZXk6J20A0Ent6uEp/R2RdfUThBPWEgrIEHuTxGPhE/xMkWxSPWp72U2vPDw2PX6xaj4NZ2uTJVIzzGUKARA==,iv:V0NKo09OMLIhVFaK43JLTTy+etvJn/Ez4UHTb8prQDY=,tag:Ti/Vnu2UC7MbTwIWqP2U7A==,type:str]", "data": "ENC[AES256_GCM,data:7AM1HQJtfUtF9IzP1snk8ULWYQNj2FNECp4Ioro2Btm49kV/sKYNn28CvBU5Pxz7X3vt/D8As2aAiFCh6rKGqYcBFUnm4/+JIZjiz7JIoNq9WoBY67Dj1xmwFeq648beLAVIKaKrMg==,iv:WQRPJsHOrmTMflN4hbdG6q7mevJjm1vgGz7Vgh3HtzU=,tag:iuhVjV8V49qqxCGK3phRQA==,type:str]",
"sops": { "sops": {
"kms": null, "kms": null,
"gcp_kms": null, "gcp_kms": null,
@ -11,8 +11,8 @@
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnOEEwKzRKc1FPSGlHbXk0\ncnQvN2oyRERxY0d5eEdmczBpYlZrb2M0eVcwCjNrTUc2dEcyYkFwMERTSEVnTldy\nWHhjeXVkOGFGRUdoM3dIdlJiZmRFTUUKLS0tIGM0S2MxZUYvUCtIZ3pKbDl1Vi9S\nNVQ4Yk5BWFlRK1RZNWtCNDltemxtaTQKFggxv58s2w9VTvQUZPv9ryzxRinGBz8s\n62TOAVxlWL3EdUqWd7o8kK83Ryw+Vor7Rjoe6ee9RSRNJSDmEPjJCA==\n-----END AGE ENCRYPTED FILE-----\n" "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnOEEwKzRKc1FPSGlHbXk0\ncnQvN2oyRERxY0d5eEdmczBpYlZrb2M0eVcwCjNrTUc2dEcyYkFwMERTSEVnTldy\nWHhjeXVkOGFGRUdoM3dIdlJiZmRFTUUKLS0tIGM0S2MxZUYvUCtIZ3pKbDl1Vi9S\nNVQ4Yk5BWFlRK1RZNWtCNDltemxtaTQKFggxv58s2w9VTvQUZPv9ryzxRinGBz8s\n62TOAVxlWL3EdUqWd7o8kK83Ryw+Vor7Rjoe6ee9RSRNJSDmEPjJCA==\n-----END AGE ENCRYPTED FILE-----\n"
} }
], ],
"lastmodified": "2024-05-21T18:41:29Z", "lastmodified": "2024-06-26T03:19:42Z",
"mac": "ENC[AES256_GCM,data:SMelsZxZPQHkbNckfodg7tm99SGCoFflI6I1T+z3jafcMVUNbKj5H5BqSIqerDivsgXS4q7p83si6cvVcx3ePqvmSkeCjCxq2f+txmuDVYfqBJq3SvQ6C9zTnSYcefDYMaWFSGR8Yvw3zCH45s94DeGl3F5eo2HEV1S8M+7eos4=,iv:og+kLgKE4U3F84psUiobkd1cJSqLIu+Pu4W54x3twyM=,tag:uJDTfWtMhiQDAsLB9zpYFQ==,type:str]", "mac": "ENC[AES256_GCM,data:fHi0HLAtklALyIbtQzmmi++uWpgVAqApLbHVZ4fQEafkdcJ8IsargeiYh9GULiVdFUp5lVLQ42HqIOte0jRC+fTKspv1TURS4rgFxLZMTwZJcbbRkwBxYMYtEd1L/AutKZfDCWxYJgS1ovhwSWZTXdB5XUd4CjIeqqLngjIDzTY=,iv:43AA3sFEABB5aNdBuHzJ9PAIBWEb/xv3LgG/YJdL8Ek=,tag:PHq16PyAET8l/dxKHUJXEA==,type:str]",
"pgp": null, "pgp": null,
"unencrypted_suffix": "_unencrypted", "unencrypted_suffix": "_unencrypted",
"version": "3.8.1" "version": "3.8.1"

1
home/services/system/polkit-agent.nix
View file

@ -1,4 +1,3 @@
# TODO fix polkit, this dosent work
{pkgs, ...}: { {pkgs, ...}: {
systemd.user.services.polkit-gnome-authentication-agent-1 = { systemd.user.services.polkit-gnome-authentication-agent-1 = {
Unit.Description = "polkit-gnome-authentication-agent-1"; Unit.Description = "polkit-gnome-authentication-agent-1";

7
home/terminal/emulator/foot.nix
View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
pkgs,
lib,
...
}: {
programs.foot = { programs.foot = {
enable = true; enable = true;
settings = { settings = {
@ -10,6 +6,7 @@
include = "${pkgs.foot.themes}/share/foot/themes/moonfly"; include = "${pkgs.foot.themes}/share/foot/themes/moonfly";
font = "monospace:size=9"; font = "monospace:size=9";
}; };
mouse.hide-when-typing = true;
}; };
}; };
} }

22
home/terminal/programs/irssi.nix Normal file
View file

@ -0,0 +1,22 @@
{pkgs, ...}: {
programs.irssi = {
enable = true;
networks = {
liberachat = {
nick = "wheat";
server = {
address = "irc.libera.chat";
port = 6697;
autoConnect = true;
};
channels = {
nixos.autoJoin = false;
};
};
};
};
home.file.".irssi/default.theme".source = pkgs.fetchurl {
url = "https://irssi-import.github.io/themes/h3rbz.theme";
hash = "sha256-2nB+jvDXPgkMXTd6f305R2aBt/D4kbsIGbqcIllHADo=";
};
}

46
hosts/default.nix
View file

@ -2,7 +2,6 @@
self, self,
inputs, inputs,
homeImports, homeImports,
lib,
... ...
}: let }: let
specialArgs = { specialArgs = {
@ -34,7 +33,8 @@ in {
nixdesk = { nixdesk = {
deployment = { deployment = {
allowLocalDeployment = true; allowLocalDeployment = true;
targetHost = null; targetUser = "xun";
targetHost = "nixdesk.local";
}; };
imports = imports =
desktop desktop
@ -44,12 +44,11 @@ in {
"${self}/secrets" "${self}/secrets"
"${self}/secrets/nixdesk" "${self}/secrets/nixdesk"
"${mod}/network/wifi.nix" #"${mod}/network/wifi.nix"
"${mod}/services/syncthing.nix" "${mod}/services/syncthing.nix"
"${mod}/services/virt/podman.nix" #"${mod}/services/virt/podman.nix"
"${mod}/services/virt/waydroid.nix" "${mod}/services/virt/waydroid.nix"
"${mod}/services/virt/distrobox.nix"
"${mod}/services/virt/virt-manager.nix" "${mod}/services/virt/virt-manager.nix"
#"${mod}/services/ollama.nix" #"${mod}/services/ollama.nix"
"${mod}/desktop/x11/nosleep.nix" "${mod}/desktop/x11/nosleep.nix"
@ -79,33 +78,33 @@ in {
"${mod}/core" "${mod}/core"
"${mod}/programs" #"${mod}/programs"
"${mod}/programs/steam.nix" #"${mod}/programs/steam.nix"
"${mod}/desktop" #"${mod}/desktop"
"${mod}/desktop/awesome.nix" #"${mod}/desktop/awesome.nix"
"${mod}/hardware/opengl.nix" #"${mod}/hardware/opengl.nix"
"${mod}/hardware/steam-hardware.nix" #"${mod}/hardware/steam-hardware.nix"
"${mod}/hardware/bluetooth.nix" #"${mod}/hardware/bluetooth.nix"
"${mod}/hardware/qmk.nix" #"${mod}/hardware/qmk.nix"
"${mod}/network/avahi.nix" "${mod}/network/avahi.nix"
"${mod}/network/networkd.nix" "${mod}/network/networkd.nix"
"${mod}/network/tailscale.nix" "${mod}/network/tailscale.nix"
"${mod}/services" #"${mod}/services"
"${mod}/services/pipewire.nix" #"${mod}/services/pipewire.nix"
"${mod}/services/syncthing.nix" "${mod}/services/syncthing.nix"
#"${mod}/services/containers/server" #"${mod}/services/containers/server"
"${mod}/services/containers/experimental" "${mod}/services/containers/experimental"
{ #{
home-manager = { # home-manager = {
users.xun.imports = homeImports."xun@hopper"; # users.xun.imports = homeImports."xun@hopper";
extraSpecialArgs = specialArgs; # extraSpecialArgs = specialArgs;
}; # };
} #}
]; ];
}; };
liveiso = { liveiso = {
@ -124,9 +123,10 @@ in {
}; };
flake.nixosConfigurations = let flake.nixosConfigurations = let
l = inputs.nixpkgs.lib; l = inputs.nixpkgs.lib;
in (builtins.mapAttrs (_n: v: in
builtins.mapAttrs (_: v:
l.nixosSystem { l.nixosSystem {
inherit specialArgs; inherit specialArgs;
modules = v.imports; modules = v.imports;
}) (l.filterAttrs (n: _: n != "meta") self.colmena)); }) (l.filterAttrs (n: _: n != "meta") self.colmena);
} }

4
hosts/hopper/default.nix
View file

@ -7,10 +7,6 @@
./brawlstats.nix ./brawlstats.nix
]; ];
services.tailscale.extraUpFlags = [
"--ssh"
];
networking.hostName = "hopper"; networking.hostName = "hopper";
swapDevices = []; swapDevices = [];

2
modules/default.nix
View file

@ -1,5 +1,5 @@
{ {
flake.nixosModules = { flake.nixosModules = {
# name = import ./name #name = import ./name;
}; };
} }

4
pkgs/gamesand/default.nix
View file

@ -5,7 +5,7 @@
symlinkJoin { symlinkJoin {
name = "gamesand"; name = "gamesand";
paths = [ paths = [
((steamPackages.steam-fhsenv-without-steam.override (steamPackages.steam-fhsenv-without-steam.override
{ {
extraBwrapArgs = [ extraBwrapArgs = [
"--ro-bind ./files /game/files" "--ro-bind ./files /game/files"
@ -15,7 +15,7 @@ symlinkJoin {
"--cap-add ALL" "--cap-add ALL"
]; ];
}) })
.run) .run
]; ];
postBuild = '' postBuild = ''
mv $out/bin/steam-run $out/bin/gamesand mv $out/bin/steam-run $out/bin/gamesand

9
system/core/default.nix
View file

@ -2,15 +2,11 @@
imports = [ imports = [
./security.nix ./security.nix
./users.nix ./users.nix
./tools.nix
./ssh.nix ./ssh.nix
./compat.nix
../nix ../nix
../programs/zsh.nix ../programs/zsh.nix
]; ];
documentation.dev.enable = true;
i18n = { i18n = {
defaultLocale = "en_US.UTF-8"; defaultLocale = "en_US.UTF-8";
supportedLocales = [ supportedLocales = [
@ -19,8 +15,5 @@
}; };
services.xserver.xkb.layout = "eu"; services.xserver.xkb.layout = "eu";
# don't touch this time.timeZone = lib.mkDefault "Europe/Berlin";
system.stateVersion = lib.mkDefault "23.11";
time.timeZone = lib.mkDefault "Europe/Stockholm";
} }

15
system/core/docs.nix Normal file
View file

@ -0,0 +1,15 @@
{pkgs, ...}: {
documentation = {
dev.enable = true;
man.generateCaches = true;
man = {
man-db.enable = false;
mandoc.enable = true;
};
};
environment.systemPackages = with pkgs; [
linux-manual
man-pages
man-pages-posix
];
}

4
system/core/harden.nix Normal file
View file

@ -0,0 +1,4 @@
{
#TODO: add stuff here
# use lynis mayb
}

4
system/default.nix
View file

@ -1,7 +1,9 @@
let let
desktop = [ desktop = [
./core ./core
./core/compat.nix
./core/boot.nix ./core/boot.nix
./core/docs.nix
./core/gvfs.nix ./core/gvfs.nix
./hardware/opengl.nix ./hardware/opengl.nix
@ -13,6 +15,7 @@ let
./network/avahi.nix ./network/avahi.nix
./network/localsend.nix ./network/localsend.nix
./network/tailscale.nix ./network/tailscale.nix
./network/goldberg.nix
./desktop ./desktop
./desktop/awesome.nix ./desktop/awesome.nix
@ -20,6 +23,7 @@ let
#./desktop/hyprland.nix #./desktop/hyprland.nix
./programs ./programs
./programs/tools.nix
./services ./services
./services/pipewire.nix ./services/pipewire.nix

2
system/hardware/opengl.nix
View file

@ -1,4 +1,4 @@
{...}: { {
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
driSupport = true; driSupport = true;

6
system/network/goldberg.nix Normal file
View file

@ -0,0 +1,6 @@
{
networking.firewall = {
allowedTCPPorts = [47584];
allowedUDPPorts = [47584];
};
}

0
system/core/tools.nix → system/programs/tools.nix
View file

5
system/programs/zsh.nix
View file

@ -3,7 +3,10 @@
environment.pathsToLink = ["/share/zsh"]; environment.pathsToLink = ["/share/zsh"];
programs = { programs = {
less.enable = true; less = {
enable = true;
envVariables.LESS = "--mouse";
};
zsh = { zsh = {
enable = true; enable = true;

38
system/services/containers/experimental/default.nix
View file

@ -15,14 +15,14 @@
reloadServices = ["podman-caddy.service"]; reloadServices = ["podman-caddy.service"];
}; };
certs = { certs = {
"xun.cam" = { "xunuwu.xyz" = {
dnsProvider = "cloudflare"; dnsProvider = "cloudflare";
credentialFiles = { credentialFiles = {
CF_DNS_API_TOKEN_FILE = config.sops.secrets.cloudflare.path; CF_DNS_API_TOKEN_FILE = config.sops.secrets.cloudflare.path;
}; };
extraDomainNames = [ extraDomainNames = [
"jellyfin.xun.cam" "jellyfin.xunuwu.xyz"
"wakapi.xun.cam" "wakapi.xunuwu.xyz"
]; ];
}; };
}; };
@ -137,25 +137,25 @@
caddy = { caddy = {
image = "caddy"; image = "caddy";
volumes = [ volumes = [
#alt.xun.cam:8336 { #alt.xunuwu.xyz:8336 {
#tls internal #tls internal
#reverse_proxy #reverse_proxy
#localhost:5030 #localhost:5030
#} #}
"${builtins.toFile "Caddyfile" '' "${builtins.toFile "Caddyfile" ''
https://jellyfin.xun.cam:8336 { https://jellyfin.xunuwu.xyz:8336 {
tls /etc/ssl/certs/xun.cam/cert.pem /etc/ssl/certs/xun.cam/key.pem tls /etc/ssl/certs/xunuwu.xyz/cert.pem /etc/ssl/certs/xunuwu.xyz/key.pem
reverse_proxy localhost:8096 reverse_proxy localhost:8096
} }
https://wakapi.xun.cam:8336 { https://wakapi.xunuwu.xyz:8336 {
tls /etc/ssl/certs/xun.cam/cert.pem /etc/ssl/certs/xun.cam/key.pem tls /etc/ssl/certs/xunuwu.xyz/cert.pem /etc/ssl/certs/xunuwu.xyz/key.pem
reverse_proxy localhost:3000 reverse_proxy localhost:3000
} }
''}:/etc/caddy/Caddyfile" ''}:/etc/caddy/Caddyfile"
#tls /etc/ssl/certs/cloudflare/cert.pem /etc/ssl/certs/cloudflare/key.pem #tls /etc/ssl/certs/cloudflare/cert.pem /etc/ssl/certs/cloudflare/key.pem
#"${config.sops.secrets.xun-cam-cert.path}:/etc/ssl/certs/cloudflare/cert.pem" #"${config.sops.secrets.xunuwu.xyz-cert.path}:/etc/ssl/certs/cloudflare/cert.pem"
#"${config.sops.secrets.xun-cam-key.path}:/etc/ssl/certs/cloudflare/key.pem" #"${config.sops.secrets.xunuwu.xyz-key.path}:/etc/ssl/certs/cloudflare/key.pem"
"/var/lib/acme/xun.cam:/etc/ssl/certs/xun.cam" "/var/lib/acme/xunuwu.xyz:/etc/ssl/certs/xunuwu.xyz"
"/media/config/caddy/data:/data" "/media/config/caddy/data:/data"
"/media/config/caddy/config:/config" "/media/config/caddy/config:/config"
]; ];
@ -192,7 +192,7 @@
# "${config.sops.secrets.authelia_encryption_key.path}:/secrets/STORAGE_ENCRYPTION_KEY" # "${config.sops.secrets.authelia_encryption_key.path}:/secrets/STORAGE_ENCRYPTION_KEY"
# "${builtins.toFile "users_database.yml" '' # "${builtins.toFile "users_database.yml" ''
# them: auto # them: auto
# default_redirection_url: https://auth.xun.cam:8336 # default_redirection_url: https://auth.xunuwu.xyz:8336
# authentication_backend: # authentication_backend:
# ldap: # ldap:
@ -215,14 +215,14 @@
# notifier: # notifier:
# smtp: # smtp:
# host: smtp.xun.cam # host: smtp.xunuwu.xyz
# port: 8336 # port: 8336
# username: auth@xun.cam # username: auth@xunuwu.xyz
# sender: "Authelia <auth@xun.cam" # sender: "Authelia <auth@xunuwu.xyz"
# ''}:/config/configuration.yml" # ''}:/config/configuration.yml"
# "${builtins.toFile "configuration.yml" '' # "${builtins.toFile "configuration.yml" ''
# them: auto # them: auto
# default_redirection_url: https://auth.xun.cam:8336 # default_redirection_url: https://auth.xunuwu.xyz:8336
# authentication_backend: # authentication_backend:
# file: # file:
@ -248,10 +248,10 @@
# notifier: # notifier:
# smtp: # smtp:
# host: smtp.xun.cam # host: smtp.xunuwu.xyz
# port: 8336 # port: 8336
# username: auth@xun.cam # username: auth@xunuwu.xyz
# sender: "Authelia <auth@xun.cam" # sender: "Authelia <auth@xunuwu.xyz"
# ''}:/config/configuration.yml" # ''}:/config/configuration.yml"
# ]; # ];
# dependsOn = ["gluetun"]; # dependsOn = ["gluetun"];

2
system/services/default.nix
View file

@ -1,4 +1,4 @@
{...}: { {
services = { services = {
dbus.implementation = "broker"; dbus.implementation = "broker";

5
system/services/ollama.nix
View file

@ -1,9 +1,6 @@
{ {
services.ollama = { services.ollama = {
enable = true; enable = true;
environmentVariables = { #rocmOverrideGfx = "10.3.0";
HSA_OVERRIDE_GFX_VERSION = "10.3.0";
};
listenAddress = "127.0.0.1:11434";
}; };
} }