Bash config isolated, cleanup

config/hyprlock.conf

@@ -10,7 +10,7 @@ general {
 
 background {
     monitor =
-    path = /home/foglar/dotfiles/nixos/aurora_borealis.png
+    path = /home/foglar/dotfiles/config/backgrounds/aurora_borealis.png
     color = rgba(25, 20, 20, 1.0)
 
     # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations

flake.lock

@@ -108,11 +108,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1732248209,
+        "lastModified": 1732437995,
-        "narHash": "sha256-Mv8k0VuGdb6YhhKt+8SIvhMdmI4xZhw/3ycSvlAq19Q=",
+        "narHash": "sha256-e+a2fakuHryskUKuupz3ZhwEM9MFD6eUxM7dRJAlOLs=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "4a8ba00d1be3f3745428ed56efbb32155c548192",
+        "rev": "9fdaef6ec5c8317cee125ea69b5b79fa73a26c69",
         "type": "gitlab"
       },
       "original": {
@@ -252,11 +252,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732025103,
+        "lastModified": 1732420764,
-        "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
+        "narHash": "sha256-u6JOOVlnGe8fMekW0BgaHuuZwbJp4ixQaMA5BEvRoDA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
+        "rev": "67cd4814a247fd0fe97171acb90659f7e304bcb8",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1732242702,
+        "lastModified": 1732416388,
-        "narHash": "sha256-fJ+fGtTRLSMBdaz0q2yi2xlC0gMTo+4cGjcLlwtOGQk=",
+        "narHash": "sha256-9kCpC9NtQwm5hrPseqLF8nN2eWZv/3I1KmuvNlxv03w=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "b1003445953474b967464d4d0878955d37498647",
+        "rev": "55ec8bd512605a014cc322d3419a9cfa72178340",
         "type": "github"
       },
       "original": {

flake.nix

@@ -11,6 +11,7 @@
     hyprland = {
       url = "github:hyprwm/Hyprland";
     };
+    
     #hyprland-plugins = {
     #  url = "github:hyprwm/hyprland-plugins";
     #  inputs.hyprland.follows = "hyprland";
@@ -42,6 +43,10 @@
     nix-ld,
     ...
   } @ inputs: let
+
+    username = "foglar";
+    hostname = "laptop";
+
     system = "x86_64-linux";
 
     pkgs = import nixpkgs {
@@ -62,13 +67,15 @@
   in {
     nixosConfigurations = {
       laptop = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs system pkgs pkgs-stable;};
+        specialArgs = {
+          inherit inputs system pkgs pkgs-stable username hostname;
+        };
 
         modules = [
           ./nixos/configuration.nix
           inputs.stylix.nixosModules.stylix
           nix-ld.nixosModules.nix-ld
-          { programs.nix-ld.dev.enable = true; }
+          {programs.nix-ld.dev.enable = true;}
         ];
       };
     };

nixos/configuration.nix

@@ -2,6 +2,7 @@
   inputs,
   pkgs,
   pkgs-stable,
+  username,
   ...
 }: {
   imports = [
@@ -28,14 +29,14 @@
     WLR_NO_HARDWARE_CURSORS = "1";
     NIXOS_OZONE_WL = "1";
     EDITOR = "nvim";
-    FLAKE = "/home/foglar/dotfiles";
+    FLAKE = "/home/${username}/dotfiles";
 
     DEFAULT_BROWSER = "${pkgs.librewolf}/bin/librewolf";
   };
 
-  users.users.foglar = {
+  users.users.${username} = {
     isNormalUser = true;
-    description = "foglar";
+    description = "${username}";
     extraGroups = ["wheel"];
   };
 

nixos/desktop/hyprland/hyprland.nix

@@ -148,7 +148,7 @@
         "$mod" = "SUPER";
         "$term" = "${pkgs.kitty}/bin/kitty";
         "$editor" = "${pkgs.vscode}/bin/code";
-        "$file" = "dolphin";
+        "$file" = "nautilus";
         "$browser" = "${pkgs.librewolf}/bin/librewolf";
 
         animations = {

nixos/desktop/hyprland/packages.nix

@@ -5,8 +5,6 @@
       hypridle
       hyprpolkitagent
 
-      kdePackages.dolphin
-
       dunst
       libnotify
       swayosd
@@ -81,5 +79,6 @@
     #(writeShellScriptBin "rofilaunch" '''')
   ]) ++ (with pkgs-stable; [
     pavucontrol
+    gnome.nautilus
   ]);
 }

nixos/desktop/hyprland/rofi.nix

@@ -69,7 +69,7 @@
           orientation = mkLiteral "vertical";
           children = ["inputbar" "listbox"];
           background-color = mkLiteral "transparent";
-          background-image = mkLiteral "url(\"~/dotfiles/nixos/aurora_borealis.png\", height)";
+          background-image = mkLiteral "url(\"~/dotfiles/config/backgrounds/aurora_borealis.png\", height)";
         };
       
         # Input bar settings
@@ -79,7 +79,7 @@
           padding = mkLiteral "5em";
           children = ["entry"];
           background-color = mkLiteral "transparent";
-          background-image = mkLiteral "url(\"~/dotfiles/nixos/aurora_borealis.png\", width)";
+          background-image = mkLiteral "url(\"~/dotfiles/config/backgrounds/aurora_borealis.png\", width)";
         };
       
         # Entry field settings

nixos/home.nix

@@ -14,37 +14,6 @@
 
   gtk.enable = true;
 
-  programs.bash = {
-    enable = true;
-    enableCompletion = true;
-
-    shellAliases = {
-      vim = "nvim";
-      ls = "exa --icons";
-      ll = "exa -alh --icons";
-      tree = "exa --tree --icons";
-      open = "rifle";
-      ip = "ip -c";
-      s = "kitten ssh";
-      diff = "diff --color";
-      cd = "z";
-
-      respawn = "clear; pfetch";
-      l = "eza -lh  --icons=auto";
-      mkdir = "mkdir -p";
-      cat = "bat --style plain";
-      rasp = "s foglar@192.168.8.140";
-      hist = "history | awk '{for (i=2; i<=NF; i++) printf \$i\" \"; print \"\"}' | fzf | wl-copy";
-      packages = "paru -Qe | fzf | wl-copy";
-      cdx = "zoxide query --interactive";
-
-      distrobox-enter = "distrobox-enter --root";
-      distrobox-create = "distrobox-create --root";
-    };
-
-    bashrcExtra = ''
-      pfetch'';
-  };
 
   home.file = {
     ".config/hypr/hyprlock.conf".source = ../config/hyprlock.conf;
@@ -58,14 +27,6 @@
       }
     '';
   };
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-    FLAKE = "/home/foglar/dotfiles";
-    XDG_DATA_HOME = "$HOME/.local/share";
-    XDG_PICTURES_DIR = "$HOME/Pictures/Screenshots/";
-  };
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }

nixos/packages/applications.nix

@@ -23,13 +23,13 @@
         libreoffice
         localsend
         plasma5Packages.kdeconnect-kde
-        qbittorrent
         vlc
         openrocket
         spotify
         spotube
         inkscape
         gnome-disk-utility
+        qbittorrent
       ])
       ++ (with pkgs-stable; [
         loupe

nixos/packages/games.nix

@@ -12,8 +12,8 @@
     home.packages = with pkgs; [
       vitetris
       steam
+      superTuxKart
       heroic
-      gamescope
       wine
 
       (writeShellScriptBin "nvidia-offload" ''
@@ -23,6 +23,36 @@
         export __VK_LAYER_NV_optimus=NVIDIA_only
         exec "$@"
       '')
+
+      (writeShellScriptBin "gs" ''
+            set -xeuo pipefail
+
+        gamescopeArgs=(
+            --adaptive-sync # VRR support
+            --hdr-enabled
+            --mangoapp # performance overlay
+            --rt
+            --steam
+        )
+        steamArgs=(
+            -pipewire-dmabuf
+            -tenfoot
+        )
+        mangoConfig=(
+            cpu_temp
+            gpu_temp
+            ram
+            vram
+        )
+        mangoVars=(
+            MANGOHUD=1
+            MANGOHUD_CONFIG="$(IFS=,; echo "''${mangoConfig[*]}")"
+        )
+
+        export "''${mangoVars[@]}"
+        exec gamescope "''${gamescopeArgs[@]}" -- steam "''${steamArgs[@]}"
+
+      '')
     ];
   };
 }

nixos/packages/packages.nix

@@ -30,7 +30,6 @@
       "discord"
       "spotify"
 
-      "webstorm"
       "pycharm"
       "pycharm-professional"
       

nixos/packages/programming/code.nix

@@ -5,10 +5,10 @@
   ...
 }: {
   options = {
-    vscode.enable = lib.mkEnableOption "enable vscode";
+    programming.vscode.enable = lib.mkEnableOption "enable vscode";
   };
 
-  config = lib.mkIf config.vscode.enable {
+  config = lib.mkIf config.programming.vscode.enable {
     home.packages = with pkgs; [
       vscode
       gopls
@@ -37,6 +37,7 @@
         "security.workspace.trust.enabled" = false;
         "terminal.external.linuxExec" = "kitty";
         "terminal.integrated.stickyScroll.enabled" = true;
+        "terminal.integrated.inheritEnv"= false;
         "telemetry.telemetryLevel" = "off";
         "workbench.activityBar.location" = "hidden"; # bottom
         "workbench.iconTheme" = "material-icon-theme";

nixos/packages/programming/git.nix

@@ -6,10 +6,10 @@
   }:
 {
   options = {
-    git.enable = lib.mkEnableOption "enable git";
+    programming.git.enable = lib.mkEnableOption "enable git";
   };
 
-  config = lib.mkIf config.git.enable {
+  config = lib.mkIf config.programming.git.enable {
     programs.git = {
       enable = true;
       userName = "foglar";

nixos/packages/programming/programming.nix

@@ -17,8 +17,8 @@
 
   config = lib.mkIf config.programming.enable {
     
-    vscode.enable = lib.mkDefault true;
+    programming.vscode.enable = lib.mkDefault true;
-    git.enable = lib.mkDefault true;
+    programming.git.enable = lib.mkDefault true;
 
     home.packages = with pkgs; [
       neovim
@@ -27,7 +27,6 @@
       go
       jq
       conda
-      jetbrains.webstorm
       jetbrains.pycharm-professional
       dotnet-sdk_8
       nodejs

nixos/packages/terminal_tools.nix

@@ -15,7 +15,8 @@
 
   config = lib.mkIf config.terminal_tools.enable {
 
-    oh-my-posh.enable = lib.mkDefault true;
+    shell.bash.enable = lib.mkDefault true;
+    shell.bash.oh-my-posh.enable = lib.mkDefault true;
 
     programs = {
       bat.enable = true;

nixos/packages/tools/oh-my-posh.nix

@@ -5,10 +5,10 @@
   ...
 }: {
   options = {
-    oh-my-posh.enable = lib.mkEnableOption "enable oh-my-posh";
+    shell.oh-my-posh.enable = lib.mkEnableOption "enable oh-my-posh";
   };
 
-  config = lib.mkIf config.oh-my-posh.enable {
+  config = lib.mkIf config.shell.oh-my-posh.enable {
     programs.oh-my-posh = {
       enable = true;
       enableBashIntegration = true;

nixos/packages/tools/shell.nix

@@ -0,0 +1,47 @@
+{lib, ...}: {
+  options = {
+    shell.enable =
+      lib.mkEnableOption "enables shell tools";
+  };
+
+  config = lib.mkIf lib.config.shell.enable {
+    programs.bash = {
+      enable = true;
+      enableCompletion = true;
+
+      shellAliases = {
+        vim = "nvim";
+        ls = "exa --icons";
+        ll = "exa -alh --icons";
+        tree = "exa --tree --icons";
+        open = "rifle";
+        ip = "ip -c";
+        s = "kitten ssh";
+        diff = "diff --color";
+        cd = "z";
+
+        respawn = "clear; pfetch";
+        l = "eza -lh  --icons=auto";
+        mkdir = "mkdir -p";
+        cat = "bat --style plain";
+        rasp = "s foglar@192.168.8.140";
+        hist = "history | awk '{for (i=2; i<=NF; i++) printf \$i\" \"; print \"\"}' | fzf | wl-copy";
+        cdx = "zoxide query --interactive";
+
+        distrobox-enter = "distrobox-enter --root";
+        distrobox-create = "distrobox-create --root";
+        distrobox-list = "distrobox-list --root";
+      };
+
+      bashrcExtra = ''
+        pfetch'';
+    };
+
+    home.sessionVariables = {
+      EDITOR = "nvim";
+      FLAKE = "/home/foglar/dotfiles";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_PICTURES_DIR = "$HOME/Pictures/Screenshots/";
+    };
+  };
+}

nixos/system/packages.nix

@@ -13,6 +13,7 @@
     tor.enable = lib.mkDefault true;
     virt-manager.enable = lib.mkDefault true;
   };
+  desktop.steamdeck.enable = lib.mkDefault false;
   programs.kdeconnect.enable = true;
   programs.wireshark.enable = true;
 }

nixos/system/packages/docker.nix

@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  username,
   ...
 }: {
   options = {
@@ -16,6 +17,6 @@
       };
     };
 
-    users.users.foglar.extraGroups = [ "docker" ];
+    users.users.${username}.extraGroups = [ "docker" ];
   };
 }

nixos/system/packages/steam.nix

@@ -1,18 +1,33 @@
 {
   lib,
   config,
+  pkgs,
+  username,
   ...
 }: {
   options = {
     package.steam.enable = lib.mkEnableOption "Enable Steam module";
+    desktop.steamdeck.enable = lib.mkEnableOption "Enable Steam desktop integration";
   };
 
-  config = lib.mkIf config.package.steam.enable {
+  config = lib.mkMerge [
+    (lib.mkIf config.package.steam.enable {
       programs.steam = {
         enable = true;
+        gamescopeSession.enable = true;
         remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
         dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
         localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
       };
+    })
+    (lib.mkIf config.desktop.steamdeck.enable {
+      services.getty.autologinUser = "${username}";
+      environment = {
+        systemPackages = [pkgs.mangohud];
+        loginShellInit = ''
+          [[ "$(tty)" = "/dev/tty1" ]] && gs
+        '';
       };
+    })
+  ];
 }

nixos/system/sys/audio.nix

@@ -1,5 +1,11 @@
-{...}:
 {
+  lib,
+  config,
+  ...
+}: {
+  options.sys.audio.enable = lib.mkEnableOption "Enable audio support";
+
+  config = lib.mkIf config.sys.audio.enable {
     # Enable sound with pipewire.
     hardware.pulseaudio.enable = false;
     security.rtkit.enable = true;
@@ -15,4 +21,5 @@
       # no need to redefine it in your config for now)
       #media-session.enable = true;
     };
+  };
 }

nixos/system/sys/desktops.nix

@@ -1,30 +1,19 @@
 {
+  lib,
+  config,
   inputs,
   pkgs,
   ...
-}:
+}: {
-{
+  options = {
-  services.desktopManager.plasma6.enable = true;
+    sys.desktop.plasma.enable = lib.mkEnableOption "Plasma Desktop";
-  #services.xserver.desktopManager.gnome.enable = true;
+    sys.desktop.gnome.enable = lib.mkEnableOption "GNOME Desktop";
+    sys.desktop.hyprland.enable = lib.mkEnableOption "Hyprland Desktop";
+  };
 
-  #environment.gnome.excludePackages = with pkgs; [
+  config = lib.mkMerge [
-  #  gnome-tour
+    (lib.mkIf config.sys.desktop.plasma.enable {
-  #  gnome-connections
+      services.desktopManager.plasma6.enable = true;
-  #  epiphany # web browser
-  #  geary # email reader. Up to 24.05. Starting from 24.11 the package name is just geary.
-  #  #evince # document viewer
-  #  gnome-weather
-  #  gnome-contacts
-  #  gnome-maps
-  #  gnome-logs
-  #  gnome-music
-  #  gnome-system-monitor
-  #  gnome-text-editor
-  #  yelp
-  #  totem
-  #  snapshot
-  #  seahorse
-  #];
 
       environment.plasma6.excludePackages = with pkgs.kdePackages; [
         ark
@@ -38,11 +27,38 @@
         krdp
         khelpcenter
       ];
+    })
 
+    (lib.mkIf config.sys.desktop.gnome.enable {
+      services.xserver.desktopManager.gnome.enable = true;
+
+      environment.gnome.excludePackages = with pkgs; [
+        gnome-tour
+        gnome-connections
+        epiphany # web browser
+        geary # email reader. Up to 24.05. Starting from 24.11 the package name is just geary.
+        #evince # document viewer
+        gnome-weather
+        gnome-contacts
+        gnome-maps
+        gnome-logs
+        gnome-music
+        gnome-system-monitor
+        gnome-text-editor
+        yelp
+        totem
+        snapshot
+        seahorse
+      ];
+    })
+
+    (lib.mkIf config.sys.desktop.hyprland.enable {
       programs.hyprland = {
         enable = true;
         xwayland.enable = true;
         package = inputs.hyprland.packages."${pkgs.system}".hyprland;
         portalPackage = pkgs.xdg-desktop-portal-hyprland;
       };
+    })
+  ];
 }

nixos/system/sys/fonts.nix

@@ -1,8 +1,19 @@
-{pkgs, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  options = {
+    sys.fonts.packages = pkgs.lib.mkEnableOption "Install fonts";
+  };
+
+  config = lib.mkIf config.sys.fonts.packages {
     fonts.packages = with pkgs; [
       noto-fonts
       noto-fonts-emoji
       (nerdfonts.override {fonts = ["JetBrainsMono"];})
       monaspace
     ];
+  };
 }

nixos/system/sys/locales.nix

@@ -1,4 +1,15 @@
-{...}: {
+{
+  lib,
+  config,
+  ...
+}: {
+  options = {
+    sys.locales = {
+      enable = lib.mkEnableOption "Enable locales configuration";
+    };
+  };
+
+  config = lib.mkIf config.sys.locales.enable {
     # Set your time zone.
     time.timeZone = "Europe/Prague";
     # Select internationalisation properties.
@@ -20,4 +31,5 @@
       xkb.layout = "us,cz";
       xkb.options = "grp:win_space_toggle";
     };
+  };
 }

nixos/system/sys/network.nix

@@ -1,5 +1,18 @@
-{...}: {
+{
-  networking.hostName = "laptop"; # Define your hostname.
+  lib,
+  config,
+  hostname,
+  username,
+  ...
+}: {
+  options = {
+    sys.network.enable = lib.mkEnableOption "Enable networking";
+    sys.bluetooth.enable = lib.mkEnableOption "Enable Bluetooth support";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf config.sys.network.enable {
+      networking.hostName = "${hostname}"; # Define your hostname.
       # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
       # Configure network proxy if necessary
@@ -8,9 +21,14 @@
 
       # Enable networking
       networking.networkmanager.enable = true;
+      users.users.${username}.extraGroups = ["networkmanager"];
+    })
+    (
+      lib.mkIf config.sys.bluetooth.enable {
         hardware.bluetooth.enable = true; # enables support for Bluetooth
         hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
         services.blueman.enable = true;
-
+      }
-  users.users.foglar.extraGroups = [ "networkmanager" ];
+    )
+  ];
 }

nixos/system/sys/nvidia.nix

@@ -1,4 +1,13 @@
-{config, ...}: {
+{
+  lib,
+  config,
+  ...
+}: {
+  options = {
+    sys.nvidia.enable = lib.mkEnableOption "Enable Nvidia graphics support";
+  };
+
+  config = lib.mkIf config.sys.nvidia.enable {
     hardware = {
       graphics.enable = true;
     };
@@ -42,4 +51,5 @@
       # Optionally, you may need to select the appropriate driver version for your specific GPU.
       package = config.boot.kernelPackages.nvidiaPackages.stable;
     };
+  };
 }

nixos/system/sys/printing.nix

@@ -1,5 +1,15 @@
-{pkgs, ...}: {
+{
-  # Printing
+  lib,
+  config,
+  pkgs,
+  username,
+  ...
+}: {
+  options = {
+    sys.printing.enable = lib.mkEnableOption "Enable printing support";
+  };
+
+  config = lib.mkIf config.sys.printing.enable {
     services.printing.enable = true;
     services.printing.drivers = with pkgs; [gutenprint hplip splix];
     hardware.printers = {
@@ -22,5 +32,6 @@
     services.ipp-usb.enable = true;
     hardware.sane.extraBackends = [pkgs.hplipWithPlugin];
 
-  users.users.foglar.extraGroups = ["lp" "scanner"];
+    users.users.${username}.extraGroups = ["lp" "scanner"];
+  };
 }

nixos/system/sys/sddm.nix

@@ -1,10 +1,14 @@
 {
-  pkgs,
   lib,
+  config,
+  pkgs,
   ...
-}:
+}: {
-{
+  options = {
+    sys.sddm.enable = lib.mkEnableOption "Enable SDDM login";
+  };
 
+  config = lib.mkIf config.sys.sddm.enable {
     services.displayManager = {
       defaultSession = "hyprland";
       sddm = {
@@ -25,4 +29,5 @@
         };
       })
     ];
+  };
 }

nixos/system/sys/style.nix

@@ -1,8 +1,14 @@
 {
+  lib,
+  config,
   pkgs,
   ...
-}:
+}: {
-{
+  options = {
+    sys.style.enable = lib.mkEnableOption "Enable the Stylix theme manager.";
+  };
+
+  config = lib.mkIf config.sys.style.enable {
     stylix = {
       enable = true;
       image = ../../../config/backgrounds/aurora_borealis.png;
@@ -33,4 +39,5 @@
         };
       };
     };
+  };
 }

nixos/system/system.nix

@@ -1,5 +1,4 @@
-{...}:
+{lib, ...}: {
-{
   imports = [
     ./sys/audio.nix
     ./sys/desktops.nix
@@ -11,4 +10,21 @@
     ./sys/sddm.nix
     ./sys/style.nix
   ];
+
+  sys = {
+    audio.enable = lib.mkDefault true;
+    desktop = {
+      plasma.enable = lib.mkDefault true;
+      gnome.enable = lib.mkDefault false;
+      hyprland.enable = lib.mkDefault true;
+    };
+    fonts.packages = lib.mkDefault true;
+    locales.enable = lib.mkDefault true;
+    network.enable = lib.mkDefault true;
+    bluetooth.enable = lib.mkDefault true;
+    nvidia.enable = lib.mkDefault true;
+    printing.enable = lib.mkDefault true;
+    sddm.enable = lib.mkDefault true;
+    style.enable = lib.mkDefault true;
+  };
 }