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

cleanup, updated yubikeys and added new option updates

Browse Source
This commit is contained in:
foglar 2025-02-24 19:46:45 +01:00
parent cb4600cd01
commit cae9ef183e
6 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kogami/configuration.nix
View File

@ -18,7 +18,7 @@
# Home manager # Home manager
home-manager = { home-manager = {
extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;}; extraSpecialArgs = {inherit inputs system pkgs pkgs-stable userSettings;};
backupFileExtension = "backup"; backupFileExtension = "bak";
users = { users = {
${userSettings.username} = import ./home.nix; ${userSettings.username} = import ./home.nix;
}; };

1
nixos/home/apps/hacking.nix
View File

@ -23,6 +23,7 @@
tor-browser tor-browser
android-udev-rules android-udev-rules
postman postman
bruno
gdb gdb
xh xh
]; ];

5
nixos/home/desktop/hyprland/hyprland.nix
View File

@ -16,6 +16,7 @@
./rofi.nix ./rofi.nix
./wlogout.nix ./wlogout.nix
./hyprlock.nix ./hyprlock.nix
./hypridle.nix
./eww.nix ./eww.nix
]; ];
@ -38,10 +39,10 @@
enable = true; enable = true;
config = { config = {
common = { common = {
default = ["hyprland"]; default = ["gtk"];
}; };
}; };
extraPortals = [pkgs.xdg-desktop-portal-hyprland]; extraPortals = [pkgs.xdg-desktop-portal-gtk];
}; };
# Services for the Hyprland module # Services for the Hyprland module

38
nixos/home/packages/programming/code.nix
View File

@ -45,7 +45,7 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
userSettings = { profiles.default.userSettings = {
"files.autoSave" = "afterDelay"; "files.autoSave" = "afterDelay";
"explorer.confirmDragAndDrop" = false; "explorer.confirmDragAndDrop" = false;
#"editor.fontSize" = 16; #"editor.fontSize" = 16;
@ -67,7 +67,7 @@
"window.menuBarVisibility" = "toggle"; "window.menuBarVisibility" = "toggle";
}; };
extensions = with pkgs-stable.vscode-extensions; [ profiles.default.extensions = with pkgs-stable.vscode-extensions; [
ms-azuretools.vscode-docker ms-azuretools.vscode-docker
foxundermoon.shell-format foxundermoon.shell-format
@ -89,14 +89,14 @@
}; };
}) })
(lib.mkIf config.program.vscode.ide.python.enable { (lib.mkIf config.program.vscode.ide.python.enable {
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"[python]" = { "[python]" = {
"editor.defaultFormatter" = "ms-python.black-formatter"; "editor.defaultFormatter" = "ms-python.black-formatter";
"python.defaultInterpreterPath" = "${pkgs.python3}/bin/python"; "python.defaultInterpreterPath" = "${pkgs.python3}/bin/python";
}; };
}; };
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
ms-python.python ms-python.python
ms-python.vscode-pylance ms-python.vscode-pylance
ms-python.black-formatter ms-python.black-formatter
@ -109,7 +109,7 @@
}) })
(lib.mkIf config.program.vscode.ide.go.enable { (lib.mkIf config.program.vscode.ide.go.enable {
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"go.alternateTools" = { "go.alternateTools" = {
"go-langserver" = "${pkgs.gopls}/bin/gopls"; "go-langserver" = "${pkgs.gopls}/bin/gopls";
}; };
@ -122,13 +122,13 @@
GOPATH = "$HOME/.local/share/go"; GOPATH = "$HOME/.local/share/go";
}; };
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
golang.go golang.go
]; ];
}) })
(lib.mkIf config.program.vscode.ide.csharp.enable { (lib.mkIf config.program.vscode.ide.csharp.enable {
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
ms-dotnettools.csharp ms-dotnettools.csharp
ms-dotnettools.csdevkit ms-dotnettools.csdevkit
ms-dotnettools.vscodeintellicode-csharp ms-dotnettools.vscodeintellicode-csharp
@ -137,7 +137,7 @@
}) })
(lib.mkIf config.program.vscode.nix.enable { (lib.mkIf config.program.vscode.nix.enable {
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"nix.serverPath" = "nixd"; "nix.serverPath" = "nixd";
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"nix.serverSettings" = { "nix.serverSettings" = {
@ -158,7 +158,7 @@
}; };
}; };
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
jnoortheen.nix-ide jnoortheen.nix-ide
]; ];
home.packages = with pkgs-stable; [ home.packages = with pkgs-stable; [
@ -168,7 +168,7 @@
}) })
(lib.mkIf config.program.vscode.ide.web.enable { (lib.mkIf config.program.vscode.ide.web.enable {
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"[json]" = { "[json]" = {
"editor.defaultFormatter" = "esbenp.prettier-vscode"; "editor.defaultFormatter" = "esbenp.prettier-vscode";
}; };
@ -177,7 +177,7 @@
}; };
}; };
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
ritwickdey.liveserver ritwickdey.liveserver
esbenp.prettier-vscode esbenp.prettier-vscode
ecmel.vscode-html-css ecmel.vscode-html-css
@ -187,33 +187,33 @@
}) })
(lib.mkIf config.program.vscode.git.enable { (lib.mkIf config.program.vscode.git.enable {
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
donjayamanne.githistory donjayamanne.githistory
eamodio.gitlens eamodio.gitlens
github.vscode-pull-request-github github.vscode-pull-request-github
github.vscode-github-actions github.vscode-github-actions
]; ];
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"git.autofetch" = true; "git.autofetch" = true;
}; };
}) })
(lib.mkIf config.program.vscode.markdown.enable { (lib.mkIf config.program.vscode.markdown.enable {
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"[markdown]" = { "[markdown]" = {
"editor.defaultFormatter" = "yzhang.markdown-all-in-one"; "editor.defaultFormatter" = "yzhang.markdown-all-in-one";
}; };
}; };
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
yzhang.markdown-all-in-one yzhang.markdown-all-in-one
davidanson.vscode-markdownlint davidanson.vscode-markdownlint
]; ];
}) })
(lib.mkIf config.program.vscode.themes.enable { (lib.mkIf config.program.vscode.themes.enable {
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc-icons
zhuangtongfa.material-theme zhuangtongfa.material-theme
@ -223,18 +223,18 @@
}) })
(lib.mkIf config.program.vscode.ai.enable { (lib.mkIf config.program.vscode.ai.enable {
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"github.copilot.editor.enableAutoCompletions" = true; "github.copilot.editor.enableAutoCompletions" = true;
}; };
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
github.copilot github.copilot
github.copilot-chat github.copilot-chat
]; ];
}) })
(lib.mkIf config.program.vscode.ide.cpp.enable { (lib.mkIf config.program.vscode.ide.cpp.enable {
programs.vscode.extensions = with pkgs-stable.vscode-extensions; [ programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [
twxs.cmake twxs.cmake
ms-vscode.cmake-tools ms-vscode.cmake-tools
]; ];

9
nixos/system/packages/sops/secrets/secrets.yaml
View File

@ -3,7 +3,8 @@ kogami:
syncthing: ENC[AES256_GCM,data:ero9yQ==,iv:lPpT2WMB9BVb1o8VL0X9hDtzCZv76fLIZh7+5Tkv+Ik=,tag:SVLwrE9MK+nSpJVvEEaByw==,type:str] syncthing: ENC[AES256_GCM,data:ero9yQ==,iv:lPpT2WMB9BVb1o8VL0X9hDtzCZv76fLIZh7+5Tkv+Ik=,tag:SVLwrE9MK+nSpJVvEEaByw==,type:str]
ginoza: ginoza:
password-hash: ENC[AES256_GCM,data:xqE0y3Z7+kasYFQLn4Wuo+/c9L8BEakf2HKgN5BsttC2iDuzYSvXrP8K6pe5Skdi5Aq0MVz9LixJFM3PBgLORL1C6k0iDSardw==,iv:bKL40h0rGNmnnkA7EieKAD5KyENXOiTNsTVH1V0B7HU=,tag:c1MsRuiOK/j2b0iKOyO8FQ==,type:str] password-hash: ENC[AES256_GCM,data:xqE0y3Z7+kasYFQLn4Wuo+/c9L8BEakf2HKgN5BsttC2iDuzYSvXrP8K6pe5Skdi5Aq0MVz9LixJFM3PBgLORL1C6k0iDSardw==,iv:bKL40h0rGNmnnkA7EieKAD5KyENXOiTNsTVH1V0B7HU=,tag:c1MsRuiOK/j2b0iKOyO8FQ==,type:str]
yubikey_id: ENC[AES256_GCM,data:lvjawXMBdNA=,iv:W+FtJ9nHswIIHMChnhF+wD8+3kLGEOKHwsLUglMb9O0=,tag:0aQiUdajyRRTE0lbEFZmlw==,type:str] longinus_spear: ENC[AES256_GCM,data:MMXTgboz4yY=,iv:OCav/ZmFCKLTJ9YWAbu4692E4d/gc6T0yTs0viZFdSs=,tag:YW6WFG39eDwxkd+6xXwH/Q==,type:str]
cassius_spear: ENC[AES256_GCM,data:AwWRQOPlLoE=,iv:DACo6Xrr/3ZPMhR9Oq4bxvU02FF0k9z8WVZdqfqaD8Y=,tag:mVK1OB8I0M1Uq00QV7hyVQ==,type:str]
ssh_keys: ssh_keys:
masaoka_private: ENC[AES256_GCM,data:3xiESl2Lc9EEsTCnr9K+CUMPgpQgnH0LC/wTInuLDrsRXuBXTHUzIZT1P8DwZ520M5NeGO0qDkiF4gH9rwm2Jzp3KKR7S1aruS51mouQUnr3e965RI9jeCdogQYkXMbpGVDk0eWApUx/iQz/hKWvaCRMBWOnnsTKRgDRRBNry8MJAFlypBbpr5aGnkJYzVCRH+c8b1tY8HYuZJtQpbeI5PK3YMhyD9AiUcl3j4LduY/GGcsX1so6EeNeYwzEWG7Qh9dEO2iFGwYhqtlPs3HgY9UrKUrFht6aDP+g6uzuK2Sg5iuKgygPviN0pbFcyKUWzqpecoOaMMFuf9GpDsqtDaE+I1c8XP4Fa4Nmql5P/0LVu2ozZwvUt179oo+8GboQunr0XdLSErUZwFMZ2uAaG5ej/5xaCLmaoM9Ukj804+6LWZ6ty595LmJhYREn1C8Dvka2IBEQk7pWfC3Y0eOFfUPqcsRG6VX1Aw0a7PSPaTCK7ZBLOqaNRihn1/AZd/4yGWmh+8eHoxh+/5mMXcv3nUS/nzxUDt6AxBhJP3LXbY+XDpWU+qdlF3sibcpfwzFcffO4g6ehQ6Jsbd7kbt5CefCp2uUamHvNHXSV41s1DCPtcKzKZ+RItPLa+6GM7KvqB0GN3G56MaiTbKtXzwUPzSzZHnKK2gN3GWd9VDTWQrMlh1Zre0PhdmYtjrvBGXDcmhfftowkzZZCT3Ml76356gjszs331ddXJ9v3gRh/TX2Q,iv:8Ls+tDol+PeNCJP+sy4qwTIDFMZJA9dF4x31pygUIXk=,tag:rGqgoyYu+Nd4d3KQ8XnlfA==,type:str] masaoka_private: ENC[AES256_GCM,data:3xiESl2Lc9EEsTCnr9K+CUMPgpQgnH0LC/wTInuLDrsRXuBXTHUzIZT1P8DwZ520M5NeGO0qDkiF4gH9rwm2Jzp3KKR7S1aruS51mouQUnr3e965RI9jeCdogQYkXMbpGVDk0eWApUx/iQz/hKWvaCRMBWOnnsTKRgDRRBNry8MJAFlypBbpr5aGnkJYzVCRH+c8b1tY8HYuZJtQpbeI5PK3YMhyD9AiUcl3j4LduY/GGcsX1so6EeNeYwzEWG7Qh9dEO2iFGwYhqtlPs3HgY9UrKUrFht6aDP+g6uzuK2Sg5iuKgygPviN0pbFcyKUWzqpecoOaMMFuf9GpDsqtDaE+I1c8XP4Fa4Nmql5P/0LVu2ozZwvUt179oo+8GboQunr0XdLSErUZwFMZ2uAaG5ej/5xaCLmaoM9Ukj804+6LWZ6ty595LmJhYREn1C8Dvka2IBEQk7pWfC3Y0eOFfUPqcsRG6VX1Aw0a7PSPaTCK7ZBLOqaNRihn1/AZd/4yGWmh+8eHoxh+/5mMXcv3nUS/nzxUDt6AxBhJP3LXbY+XDpWU+qdlF3sibcpfwzFcffO4g6ehQ6Jsbd7kbt5CefCp2uUamHvNHXSV41s1DCPtcKzKZ+RItPLa+6GM7KvqB0GN3G56MaiTbKtXzwUPzSzZHnKK2gN3GWd9VDTWQrMlh1Zre0PhdmYtjrvBGXDcmhfftowkzZZCT3Ml76356gjszs331ddXJ9v3gRh/TX2Q,iv:8Ls+tDol+PeNCJP+sy4qwTIDFMZJA9dF4x31pygUIXk=,tag:rGqgoyYu+Nd4d3KQ8XnlfA==,type:str]
masaoka_public: ENC[AES256_GCM,data:g6L2wZth2SaKDrD8hKlVkVWJa6WFi0XE2ra+9HF2uhTH1llCYmLab5CEhDsjTHyh65U4IAfsrYrMwlJH2iQXn/L6SLQmR00pn6qYfQ6sURCwZvSxKoJuHTuTNv7AH8J5Nxq/u6SMjYGVKhw/6ewHEOygVs0/a+rDFcn4x2WXPgRGKLa1CEyncfvslyYL,iv:dNDGDU0ZUuRDzcUTWh4SGnbfzuRUoDL4i1j/mLwQ1Gc=,tag:E8yzoyBee3uAgit9aoOeLA==,type:str] masaoka_public: ENC[AES256_GCM,data:g6L2wZth2SaKDrD8hKlVkVWJa6WFi0XE2ra+9HF2uhTH1llCYmLab5CEhDsjTHyh65U4IAfsrYrMwlJH2iQXn/L6SLQmR00pn6qYfQ6sURCwZvSxKoJuHTuTNv7AH8J5Nxq/u6SMjYGVKhw/6ewHEOygVs0/a+rDFcn4x2WXPgRGKLa1CEyncfvslyYL,iv:dNDGDU0ZUuRDzcUTWh4SGnbfzuRUoDL4i1j/mLwQ1Gc=,tag:E8yzoyBee3uAgit9aoOeLA==,type:str]
@ -22,8 +23,8 @@ sops:
T0cxV21SN0hJaFg3R3hpTjIxa3lJNVEKdIrR5XDHxpCojk2A1pxc4dYtSJRrObbY T0cxV21SN0hJaFg3R3hpTjIxa3lJNVEKdIrR5XDHxpCojk2A1pxc4dYtSJRrObbY
JS/nDgu74LugEchiOhuIJ7nh3MS5XBOmmt2GTHrqxZEZFoIykjIGug== JS/nDgu74LugEchiOhuIJ7nh3MS5XBOmmt2GTHrqxZEZFoIykjIGug==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-01-12T19:50:22Z" lastmodified: "2025-02-19T15:03:13Z"
mac: ENC[AES256_GCM,data:r400pSUkBIgeJiuSsXQ/80lNordah1V6NB5argaUyLsVcDu/hRk39jNQpjT6eUaclfb1QTKIm7bYIBcz92KhZZZXF6kNEmNerY0P8q80A7U7oEZK93pmLB5GpyEBpPzYhCtxnJwqsG3oaggi41Hoa907QP7LpHXUzaeJTz/3rFo=,iv:k5xnupe8VTn778QaQaO16VKADTvpVY5ssRIcxkQEXcU=,tag:621xaeHsGEr8mOJerXYF+g==,type:str] mac: ENC[AES256_GCM,data:JfzYwtQJE7jq9QE79EJDYnN69vEe5WJcPVbKto0a2no1bHIDxSBJpIgczO/fah6AqYeREZe+NiQUpnc110T9iZRQ3ouhKvlcxbov3nHkjTiVYSN1pP+5V0yeYKZ4W+ivRGpfchvgK4Oo8B8NKy+0oTHhY2C4Ms0h6uUeQsVikfo=,iv:YVrQNatL8G6MS0QeOVuD3zaUQp9C/Ju1i1C6+oCxXOc=,tag:zApfKtOdIUdr9HYU9Nk6RQ==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.2 version: 3.9.4

17
nixos/system/packages/sops/sops.nix
View File

@ -33,7 +33,12 @@
group = "users"; group = "users";
}; };
"yubikey_id" = { "longinus_spear" = {
owner = userSettings.username;
group = "users";
};
"cassius_spear" = {
owner = userSettings.username; owner = userSettings.username;
group = "users"; group = "users";
}; };
@ -41,7 +46,8 @@
templates = { templates = {
"syncthing-password".content = ''${config.sops.placeholder."${userSettings.hostname}/syncthing"}''; "syncthing-password".content = ''${config.sops.placeholder."${userSettings.hostname}/syncthing"}'';
"yubikey-id".content = ''${config.sops.placeholder.yubikey_id}''; "yubikey-id".content = ''${config.sops.placeholder.longinus_spear}'';
"yubikey-id2".content = ''${config.sops.placeholder.cassius_spear}'';
}; };
}; };
@ -53,11 +59,14 @@
[] []
++ ( ++ (
if config.program.yubikey.enable if config.program.yubikey.enable
then [config.sops.templates."yubikey-id".content] then [
config.sops.templates."yubikey-id".content
config.sops.templates."yubikey-id2".content
]
else [] else []
); );
# Syncthing password # Syncthing password
services.syncthing.settings.gui.password = config.sops.templates."syncthing-password".content; #services.syncthing.settings.gui.password = config.sops.templates."syncthing-password".content;
}; };
} }