From fe85c7f6ec061ac3a2e7689d4a16ba2e3f350372 Mon Sep 17 00:00:00 2001 From: SindreKjelsrud Date: Thu, 29 May 2025 11:08:38 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A7=B9=20Clean=20up=20some=20config?= =?UTF-8?q?=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SindreKjelsrud --- hosts/wano/configuration.nix | 22 +++++++--------------- hosts/wano/home.nix | 35 ++++++++--------------------------- 2 files changed, 15 insertions(+), 42 deletions(-) diff --git a/hosts/wano/configuration.nix b/hosts/wano/configuration.nix index 96720f8..2ec2156 100644 --- a/hosts/wano/configuration.nix +++ b/hosts/wano/configuration.nix @@ -11,6 +11,8 @@ inputs.home-manager.nixosModules.default ]; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # Bootloader. boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; @@ -23,8 +25,6 @@ # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - # Enable networking networking.networkmanager.enable = true; @@ -69,11 +69,7 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - # If you want to use JACK applications, uncomment this #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) #media-session.enable = true; }; @@ -85,16 +81,9 @@ isNormalUser = true; description = "sid"; extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - alacritty - git - kdePackages.dolphin - ]; + packages = with pkgs; []; }; - # Install firefox. - programs.firefox.enable = true; - # Home Manager home-manager = { extraSpecialArgs = { inherit inputs; }; @@ -110,6 +99,10 @@ # $ nix search wget environment.systemPackages = with pkgs; [ vim + firefox + alacritty + git + kdePackages.dolphin ]; # Some programs need SUID wrappers, can be configured further or are @@ -138,5 +131,4 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "25.05"; # Did you read the comment? - } diff --git a/hosts/wano/home.nix b/hosts/wano/home.nix index ad9f8bd..c3b21e7 100644 --- a/hosts/wano/home.nix +++ b/hosts/wano/home.nix @@ -25,16 +25,6 @@ # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. home.file = { - # # Building this configuration will create a copy of 'dotfiles/screenrc' in - # # the Nix store. Activating the configuration will then make '~/.screenrc' a - # # symlink to the Nix store copy. - # ".screenrc".source = dotfiles/screenrc; - - # # You can also set the file content immediately. - # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 - # ''; }; # Home Manager can also manage your environment variables through @@ -42,17 +32,6 @@ # shell provided by Home Manager. If you don't want to manage your shell # through Home Manager then you have to manually source 'hm-session-vars.sh' # located at either - # - # ~/.nix-profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh - # - # or - # - # /etc/profiles/per-user/sid/etc/profile.d/hm-session-vars.sh - # home.sessionVariables = { # EDITOR = "emacs"; }; @@ -60,12 +39,14 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; - # Nixhelper - programs.nh = { - enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; - flake = "../../flake.nix"; + programs = { + # Nixhelper + nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "../../flake.nix"; + }; }; # GPG setup From 001cab1caa6a7b9b3d1c463c05a666adcfdf6e7d Mon Sep 17 00:00:00 2001 From: SindreKjelsrud Date: Thu, 29 May 2025 11:12:38 +0200 Subject: [PATCH 2/3] :wrench: Add vim config Signed-off-by: SindreKjelsrud --- hosts/wano/home.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hosts/wano/home.nix b/hosts/wano/home.nix index c3b21e7..ae9f576 100644 --- a/hosts/wano/home.nix +++ b/hosts/wano/home.nix @@ -47,6 +47,15 @@ clean.extraArgs = "--keep-since 4d --keep 3"; flake = "../../flake.nix"; }; + + # Vim config + vim = { + enable = true; + settings = { + tabstop = 2; + shiftwidth = 2; + }; + }; }; # GPG setup From 20fdb6abdd3b5f931240ec75691b1442167d1099 Mon Sep 17 00:00:00 2001 From: SindreKjelsrud Date: Thu, 29 May 2025 11:37:48 +0200 Subject: [PATCH 3/3] :sparkles: Added more packages - fish (enabled and set as default) - tailscale (enabled it aswell) - fastfetch - librewolf (instead of firefox) - signal - localsend - vscodium - vlc - gimp - libreoffice - prismlauncher - calibre - thunderbird - ledgerlive - nodejs - pnpm Signed-off-by: SindreKjelsrud --- hosts/wano/configuration.nix | 35 ++++++++++++++++++++++++++++++++--- hosts/wano/home.nix | 5 ++++- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/hosts/wano/configuration.nix b/hosts/wano/configuration.nix index 2ec2156..183b4e5 100644 --- a/hosts/wano/configuration.nix +++ b/hosts/wano/configuration.nix @@ -99,12 +99,41 @@ # $ nix search wget environment.systemPackages = with pkgs; [ vim - firefox alacritty - git - kdePackages.dolphin + git + fish + tailscale + fastfetch + librewolf + signal-desktop + localsend + vscodium + vlc + gimp + libreoffice-qt6-fresh + # Only related to this laptop - above to be moved to a more common config when ive added more hosts + kdePackages.dolphin + prismlauncher + calibre + thunderbird + ledger-live-desktop + nodejs_22 + pnpm ]; + # Custom services + services.tailscale.enable = true; + + programs.bash = { + interactiveShellInit = '' + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + ''; + }; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/hosts/wano/home.nix b/hosts/wano/home.nix index ae9f576..1f03614 100644 --- a/hosts/wano/home.nix +++ b/hosts/wano/home.nix @@ -55,7 +55,10 @@ tabstop = 2; shiftwidth = 2; }; - }; + }; + + # Enable fish + fish.enable = true; }; # GPG setup