From b2bc33561a70320854b7fa761f4bc052794a135b Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 12:46:22 +0100 Subject: [PATCH 01/10] Move programs to user istead of system --- home-manager/home.nix | 3 +++ nixos/configuration.nix | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index eea40ec..3afef7d 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -51,6 +51,9 @@ packages = [ (pkgs.nerdfonts.override { fonts = [ "SourceCodePro" ]; }) + + pkgs.discord + pkgs.spotify ]; }; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 8b8859f..c242f0e 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -123,9 +123,6 @@ papirus-icon-theme # Menu kind xfce.xfce4-whiskermenu-plugin - - # Spotify - spotify ]; # This value determines the NixOS release from which the default -- 2.49.1 From 290b6d44472e0ef1f3bf3e09171d4ef9dfb55e87 Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:02:47 +0100 Subject: [PATCH 02/10] Update git config to correct includes --- home-manager/git/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix index d7e1d8e..63916fb 100644 --- a/home-manager/git/default.nix +++ b/home-manager/git/default.nix @@ -22,19 +22,23 @@ fetch = { prune = true; }; }; + lfs.enable = true; + includes = [ { - condition = "gitdir:~/git.noahknegt.com"; - path = "~/.config/git/git.noahknegt.com.gitconfig"; + condition = "gitdir:~/Repos/git.noahknegt.com/"; contents = { - userEmail = "git@noahknegt.com"; + user = { + email = "git@noahknegt.com"; + }; }; } { - condition = "gitdir:~/open-source"; - path = "~/.config/git/open-source.gitconfig"; + condition = "gitdir:~/Repos/open-source/"; contents = { - userEmail = "git@noahknegt.com"; + user = { + email = "git@noahknegt.com"; + }; }; } ]; -- 2.49.1 From 91bc2efc96babdddccb3ad852124d4bf0e4b2638 Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:05:39 +0100 Subject: [PATCH 03/10] Update git config with commit signing --- home-manager/git/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/home-manager/git/default.nix b/home-manager/git/default.nix index 63916fb..d781f56 100644 --- a/home-manager/git/default.nix +++ b/home-manager/git/default.nix @@ -31,6 +31,14 @@ user = { email = "git@noahknegt.com"; }; + + commit = { + gpgSign = true; + }; + + tag = { + gpgSign = true; + }; }; } { @@ -38,6 +46,15 @@ contents = { user = { email = "git@noahknegt.com"; + signingKey = "~/.ssh/id_open_source.pub"; + }; + + commit = { + gpgSign = true; + }; + + tag = { + gpgSign = true; }; }; } -- 2.49.1 From 7cdcf0046b479046ae71a52756d847dc13760dfd Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:25:18 +0100 Subject: [PATCH 04/10] VScode settings Signed-off-by: Noah Knegt --- home-manager/IDEs/vscode.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/home-manager/IDEs/vscode.nix b/home-manager/IDEs/vscode.nix index 656ff54..b5948d4 100644 --- a/home-manager/IDEs/vscode.nix +++ b/home-manager/IDEs/vscode.nix @@ -12,5 +12,24 @@ donjayamanne.githistory eamodio.gitlens ]; + + userSettings = { + # Theme + "workbench.iconTheme" = "catppuccin-mocha"; + "workbench.colorTheme" = "Catppuccin Mocha"; + + # Settings for all files + "files.autoSave" = "off"; + + # Git settings + "git.autofetch" = true; + "git.confirmSync" = false; + "git.alwaysSignOff" = true; + "git.pruneOnFetch" = true; + + + # Nix lang settings + "[nix]"."editor.tabSize" = 2; + }; }; } \ No newline at end of file -- 2.49.1 From 67854146d3167270f7f30d3fe4357f3b5c6080c2 Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:37:49 +0100 Subject: [PATCH 05/10] Add gcc and rustup Signed-off-by: Noah Knegt --- home-manager/home.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 3afef7d..457a0d8 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -49,20 +49,20 @@ username = "noahk"; homeDirectory = "/home/noahk"; - packages = [ - (pkgs.nerdfonts.override { fonts = [ "SourceCodePro" ]; }) + packages = with pkgs; [ + (nerdfonts.override { fonts = [ "SourceCodePro" ]; }) - pkgs.discord - pkgs.spotify + discord + spotify + + # Programming + gcc + rustup ]; }; fonts.fontconfig.enable = true; - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; - # home.packages = with pkgs; [ steam ]; - # Enable home-manager and git programs.home-manager.enable = true; -- 2.49.1 From 453f73f9145591f7761fdf3ec01c26c84672f67a Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:39:34 +0100 Subject: [PATCH 06/10] Add rust plugins Signed-off-by: Noah Knegt --- home-manager/IDEs/vscode.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/IDEs/vscode.nix b/home-manager/IDEs/vscode.nix index b5948d4..d39d957 100644 --- a/home-manager/IDEs/vscode.nix +++ b/home-manager/IDEs/vscode.nix @@ -11,6 +11,11 @@ mhutchie.git-graph donjayamanne.githistory eamodio.gitlens + + # Rust plugins + rust-lang.rust-analyzer + tamasfe.even-better-toml + fill-labs.dependi ]; userSettings = { -- 2.49.1 From 1d050b009d29891fc8f977e3848c50f8724b939b Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:43:49 +0100 Subject: [PATCH 07/10] Update the sideBar location Signed-off-by: Noah Knegt --- home-manager/IDEs/vscode.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/IDEs/vscode.nix b/home-manager/IDEs/vscode.nix index d39d957..5422476 100644 --- a/home-manager/IDEs/vscode.nix +++ b/home-manager/IDEs/vscode.nix @@ -22,6 +22,8 @@ # Theme "workbench.iconTheme" = "catppuccin-mocha"; "workbench.colorTheme" = "Catppuccin Mocha"; + "workbench.sideBar.location" = "right"; + "workbench.activityBar.location" = "bottom"; # Settings for all files "files.autoSave" = "off"; -- 2.49.1 From c1f502d7c61e8aa6ebe771e9cb3dd66c81b69e3d Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:53:45 +0100 Subject: [PATCH 08/10] Set vscode font Signed-off-by: Noah Knegt --- home-manager/IDEs/vscode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/IDEs/vscode.nix b/home-manager/IDEs/vscode.nix index 5422476..8c69109 100644 --- a/home-manager/IDEs/vscode.nix +++ b/home-manager/IDEs/vscode.nix @@ -24,6 +24,7 @@ "workbench.colorTheme" = "Catppuccin Mocha"; "workbench.sideBar.location" = "right"; "workbench.activityBar.location" = "bottom"; + "editor.fontFamily" = "Source Code Pro"; # Settings for all files "files.autoSave" = "off"; -- 2.49.1 From f386649cdc1fdc6bef476b0da865e626a1226301 Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 13:58:57 +0100 Subject: [PATCH 09/10] Add jq as a tool Signed-off-by: Noah Knegt --- home-manager/tools/default.nix | 1 + home-manager/tools/jq.nix | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 home-manager/tools/jq.nix diff --git a/home-manager/tools/default.nix b/home-manager/tools/default.nix index 6af9a51..4ce84e2 100644 --- a/home-manager/tools/default.nix +++ b/home-manager/tools/default.nix @@ -5,6 +5,7 @@ ./bat.nix ./eza.nix ./fzf.nix + ./jq.nix ./ripgrep.nix ./tmux.nix ]; diff --git a/home-manager/tools/jq.nix b/home-manager/tools/jq.nix new file mode 100644 index 0000000..1506d5b --- /dev/null +++ b/home-manager/tools/jq.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + programs.jq.enable = true; +} \ No newline at end of file -- 2.49.1 From a2428ed29f2e338526f75eeec2c78ebe0ab2c88a Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Sat, 1 Mar 2025 14:03:33 +0100 Subject: [PATCH 10/10] Organize packages and add bitwarden Signed-off-by: Noah Knegt --- home-manager/home.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 457a0d8..30cd3e6 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -52,10 +52,18 @@ packages = with pkgs; [ (nerdfonts.override { fonts = [ "SourceCodePro" ]; }) + # Desktop env discord spotify + obsidian + vlc - # Programming + # Security + openvpn + bitwarden-desktop + bitwarden-cli + + # Development gcc rustup ]; -- 2.49.1