Updated hyprland setup with basic wallpaper support

flake.nix

@@ -31,21 +31,38 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
-  };
 
-  outputs = { nixpkgs, ... }@inputs:
-  let
-    system = "x86_64-linux";
-    host = "vanta";
-  in
-  {
-    nixosConfigurations.${host} = nixpkgs.lib.nixosSystem {
-      inherit system;
-      specialArgs = { inherit inputs host; };
-      modules = [
-        ./modules/system
-        ./hosts/${host}
-      ];
+    stylix = {
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    mango = {
+      url = "github:DreamMaoMao/mango";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    hyprland.url = "github:hyprwm/Hyprland";
+
+    silentSDDM = {
+      url = "github:uiriansan/SilentSDDM";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
+
+  outputs =
+    { nixpkgs, ... }@inputs:
+    {
+      nixosConfigurations.vanta = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = {
+          inherit inputs;
+          host = "vanta";
+        };
+        modules = [
+          ./modules/system
+          ./hosts/vanta
+        ];
+      };
+    };
 }

modules/home/alacritty.nix

@@ -0,0 +1,17 @@
+{
+  ...
+}:
+{
+  programs.alacritty = {
+    enable = true;
+    theme = "catppuccin_mocha";
+    settings = {
+      font = {
+        normal = {
+          family = "FiraCode Nerd Font";
+          style = "Regular";
+        };
+      };
+    };
+  };
+}

modules/home/default.nix

@@ -3,12 +3,19 @@
 }:
 {
   imports = [
+    ./alacritty.nix
     ./firefox.nix
     ./git.nix
+    ./hypr
+    ./mango.nix
     ./nvf.nix
     ./packages.nix
-    ./plasma.nix
+    # ./plasma.nix
+    ./ssh.nix
+    ./stylix.nix
     ./vscode.nix
+    ./wallpaper.nix
+    ./xdg.nix
     ./zsh.nix
   ];
 }

modules/home/firefox.nix

@@ -85,6 +85,7 @@
       };
       search = {
         default = "google";
+        force = true;
         engines = {
           nix-packages = {
             name = "Nix Packages";

modules/home/git.nix

@@ -1,18 +1,40 @@
 {
   pkgs,
+  config,
   ...
 }:
+let
+  name = "Eclypsed";
+  email = "Ec1ypsed@proton.me";
+  signingKey = "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB2h6y1Al2OVotYIpwPZMjiBLAncAI2pAPgES2+gVbJqAAAABHNzaDo= ssh:";
+in
 {
-  programs.git = {
-    enable = true;
-    userName = "Eclypsed";
-    userEmail = "Ec1ypsed@proton.me";
-    extraConfig = {
-      init = {
-        defaultBranch = "main";
+  home.packages = with pkgs; [ git-ignore ];
+
+  xdg.configFile."git/allowed_signers".text = ''
+    ${email} namespaces="git" ${signingKey}
+  '';
+
+  programs = {
+    git = {
+      enable = true;
+      settings = {
+        user = { inherit name email; };
+        init = {
+          defaultBranch = "main";
+        };
+        gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
+      };
+      signing = {
+        format = "ssh";
+        key = "${config.home.homeDirectory}/.ssh/id_ed25519_sk_rk.pub";
+        signByDefault = true;
       };
     };
+    lazygit = {
+      enable = true;
+      enableZshIntegration = true;
+      shellWrapperName = "lg";
+    };
   };
-
-  home.packages = with pkgs; [ git-ignore ];
 }

modules/home/hypr/default.nix

@@ -0,0 +1,9 @@
+{
+  ...
+}:
+{
+  imports = [
+    ./hyprland.nix
+    ./keybinds.nix
+  ];
+}

modules/home/hypr/hyprland.nix

@@ -0,0 +1,47 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = with pkgs; [
+    waybar
+    hyprpolkitagent
+  ];
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+    package = null;
+    portalPackage = null;
+
+    settings = {
+      monitor = [
+        "eDP-1, 2256x1504@60, 0x0, 1"
+      ];
+
+      decoration = {
+        rounding = 10;
+
+        active_opacity = 0.95;
+        inactive_opacity = 0.85;
+        fullscreen_opacity = 1.0;
+
+        blur = {
+          enabled = true;
+          size = 8;
+          passes = 3;
+          new_optimizations = true;
+        };
+      };
+
+      exec-once = [
+        "systemctl --user enable --now waybar.service"
+        "systemctl --user enable --now hyprpolkitagent.service"
+        "wpaperd -d"
+      ];
+
+      env = [
+        "NIXOS_OZONE_WL, 1"
+      ];
+    };
+  };
+}

modules/home/hypr/keybinds.nix

@@ -0,0 +1,69 @@
+{
+  ...
+}:
+{
+  wayland.windowManager.hyprland.settings = {
+    exec = "hyprctl dispatch submap global";
+    submap = "global";
+
+    # MY STUFF
+    "$mod" = "SUPER";
+
+    bind = [
+      "$mod, Q, killactive"
+      "$mod, W, exec, alacritty"
+      "$mod, S, exec, rofi -show drun -show-icons"
+
+      # Window Movement
+      "$mod, left, movefocus, l"
+      "$mod, right, movefocus, r"
+      "$mod, up, movefocus, u"
+      "$mod, down, movefocus, d"
+      "$mod SHIFT, left, movewindow, l"
+      "$mod SHIFT, right, movewindow, r"
+      "$mod SHIFT, up, movewindow, u"
+      "$mod SHIFT, down, movewindow, d"
+      "$mod CTRL, left, workspace, r-1"
+      "$mod CTRL, right, workspace, r+1"
+      "$mod CTRL SHIFT, left, movetoworkspace, r-1"
+      "$mod CTRL SHIFT, right, movetoworkspace, r+1"
+
+      # Brightness keys
+      ", XF86MonBrightnessUp, exec, brightnessctl set 10%+"
+      ", XF86MonBrightnessDown, exec, brightnessctl set 10%-"
+
+      # Media Control Keys
+      ", XF86AudioPrev, exec, playerctl previous"
+      ", XF86AudioPlay, exec, playerctl play-pause"
+      ", XF86AudioNext, exec, playerctl next"
+      ", XF86AudioMute, exec, pamixer -t"
+      ", XF86AudioRaiseVolume, exec, pamixer -i 5"
+      ", XF86AudioLowerVolume, exec, pamixer -d 5"
+      "ALT, XF86AudioMute, exec, pamixer --default-source -t"
+      "ALT, XF86AudioRaiseVolume, exec, pamixer --default-source -i 5"
+      "ALT, XF86AudioLowerVolume, exec, pamixer --default-source -d 5"
+    ]
+    ++ (
+      # workspaces
+      # binds $mod + [shift +] {1..9} to [move to] workspace {1..9}
+      builtins.concatLists (
+        builtins.genList (
+          i:
+          let
+            ws = i + 1;
+          in
+          [
+            "$mod, code:1${toString i}, workspace, ${toString ws}"
+            "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}"
+          ]
+        ) 9
+      )
+    );
+
+    bindm = [
+      "$mod, mouse:272, movewindow"
+      "$mod, mouse:273, resizewindow"
+      "$mod ALT, mouse:272, resizewindow"
+    ];
+  };
+}

modules/home/mango.nix

@@ -0,0 +1,37 @@
+{
+  inputs,
+  ...
+}:
+{
+  imports = [
+    inputs.mango.hmModules.mango
+  ];
+
+  wayland.windowManager.mango = {
+    enable = true;
+    settings = ''
+      bind=SUPER,Return,spawn,alacritty
+      bind=SUPER,s,spawn,rofi -show drun
+
+      bind=SUPER,q,killclient
+      bind=SUPER+SHIFT,r,reload_config
+
+      bind=SUPER,t,setlayout,tile
+      bind=SUPER,v,setlayout,vertical_grid
+      bind=SUPER,c,setlayout,spiral
+      bind=SUPER,x,setlayout,scroller
+      bind=SUPER,n,switch_layout
+      bind=SUPER,a,togglegaps
+
+      bind=SUPER,Up,focusdir,up
+      bind=SUPER,Down,focusdir,down
+      bind=SUPER,Left,focusdir,left
+      bind=SUPER,Right,focusdir,right
+
+      bind=SUPER+SHIFT,Up,exchange_client,up 
+      bind=SUPER+SHIFT,Down,exchange_client,down
+      bind=SUPER+SHIFT,Left,exchange_client,left
+      bind=SUPER+SHIFT,Right,exchange_client,right
+    '';
+  };
+}

modules/home/nvf.nix

@@ -61,9 +61,6 @@
         # Formatting files
         formatter.conform-nvim = {
           enable = true;
-          setupOpts = {
-
-          };
         };
 
         binds = {
@@ -221,6 +218,17 @@
             treesitter.enable = true;
           };
 
+          rust = {
+            enable = true;
+            # crates = {
+            #   enable = true;
+            # };
+            dap.enable = true;
+            format.enable = true;
+            lsp.enable = true;
+            treesitter.enable = true;
+          };
+
           tailwind = {
             enable = true;
             lsp.enable = true;

modules/home/packages.nix

@@ -9,19 +9,20 @@
     discord
     sqlitebrowser
     drawio
-    bitwarden-desktop
 
     # Libre Office
     libreoffice-qt
     hunspell
     hunspellDicts.en_US
 
-    # KDE
-    kdePackages.kate
-
     # CD Stuff
     picard
     heybrochecklog
     rsgain
+
+    rofi
+    playerctl
+    pamixer
+    brightnessctl
   ];
 }

modules/home/ssh.nix

@@ -0,0 +1,30 @@
+{
+  ...
+}:
+{
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "*" = {
+        addKeysToAgent = "yes";
+        identityFile = [ "~/.ssh/id_ed25519_sk_rk" ];
+      };
+      "stu" = {
+        hostname = "stu.cs.jmu.edu";
+        user = "tamassno";
+        localForwards = [
+          {
+            bind.port = 5432;
+            host = {
+              address = "data.cs.jmu.edu";
+              port = 5432;
+            };
+          }
+        ];
+        serverAliveCountMax = 5;
+        serverAliveInterval = 60;
+      };
+    };
+  };
+}

modules/home/stylix.nix

@@ -0,0 +1,57 @@
+{
+  inputs,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    inputs.stylix.homeModules.stylix
+  ];
+
+  stylix = {
+    enable = true;
+    autoEnable = false;
+    polarity = "dark";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+    targets = {
+      # firefox = {
+      #   enable = true;
+      #   colorTheme.enable = true;
+      #   firefoxGnomeTheme.enable = true;
+      #   profileNames = [ "eclypse" ];
+      # };
+      # gtk = {
+      #   enable = true;
+      # };
+      qt = {
+        enable = true;
+      };
+    };
+  };
+
+  home.pointerCursor = {
+    gtk.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Ice";
+    size = 17;
+  };
+
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    theme = {
+      name = "Tokyonight-Dark";
+      package = pkgs.tokyonight-gtk-theme.override {
+        tweakVariants = [ "macos" ];
+      };
+    };
+  };
+
+  # home.pointerCursor = {
+  #   enable = true;
+  #   gtk.enable = true;
+  #   name = "Catppuccin-Mocha-Dark-Cursors";
+  #   package = pkgs.catppuccin-cursors.mochaDark;
+  #   size = 16;
+  # };
+}

modules/home/vscode.nix

@@ -17,6 +17,7 @@
           aaron-bond.better-comments
           yzane.markdown-pdf
           mechatroner.rainbow-csv
+          catppuccin.catppuccin-vsc
 
           # Remote development
           ms-vscode-remote.remote-ssh
@@ -46,6 +47,14 @@
           # General
           "editor.formatOnSave" = true;
           "workbench.iconTheme" = "material-icon-theme";
+          "workbench.colorTheme" = "Catppuccin Mocha";
+          "catppuccin.accentColor" = "flamingo";
+
+          # Remote SSH
+          # VSCode attempts to write to ~/.ssh/config for remote ssh connections.
+          # Because ~/.ssh/config is managed with home-manager, it is not writeable.
+          # So we specify a custom ssh config path
+          "remote.SSH.configFile" = "/home/eclypse/.ssh/vscode-config";
 
           # Prettier
           "editor.defaultFormatter" = "esbenp.prettier-vscode";
@@ -85,6 +94,13 @@
 
           # C / C++
           "C_Cpp.clang_format_style" = "GNU"; # This is really just for cs361, I actually hate the GNU style
+          "C_Cpp.default.cStandard" = "gnu17";
+          "[c]" = {
+            "editor.defaultFormatter" = "ms-vscode.cpptools";
+          };
+          "[cpp]" = {
+            "editor.defaultFormatter" = "ms-vscode.cpptools";
+          };
         };
       };
     };

modules/home/wallpaper.nix

@@ -0,0 +1,25 @@
+{
+  config,
+  ...
+}:
+let
+  wallpapers = config.xdg.userDirs.extraConfig.XDG_WALLPAPERS_DIR;
+in
+{
+  home.file."${wallpapers}" = {
+    source = ../../wallpapers;
+    recursive = true;
+  };
+
+  services.wpaperd = {
+    enable = true;
+    settings = {
+      default = {
+        mode = "center";
+      };
+      any = {
+        path = "${wallpapers}/lanterns_of_twilight.png";
+      };
+    };
+  };
+}

modules/home/xdg.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  ...
+}:
+{
+  xdg = {
+    enable = true;
+    userDirs = {
+      enable = true;
+      createDirectories = true;
+      extraConfig = {
+        XDG_DEV_DIR = "${config.home.homeDirectory}/Dev";
+        XDG_WALLPAPERS_DIR = "${config.xdg.userDirs.pictures}/Wallpapers";
+        XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
+      };
+    };
+  };
+}

modules/home/zsh.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   ...
 }:
 {
@@ -7,13 +8,79 @@
       enable = true;
       enableZshIntegration = true;
     };
+    starship = {
+      enable = true;
+      enableZshIntegration = true;
+      settings = {
+        add_newline = true;
+        format = pkgs.lib.concatStrings [
+          "[░▒▓](#f38ba8)"
+          "[ 󱄅 ](fg:#1e1e2e bg:#f38ba8)"
+          "[](fg:#f38ba8 bg:#fab387)"
+          "$directory"
+          "[](fg:#fab387 bg:#f9e2af)"
+          "$git_branch"
+          "$git_status"
+          "[](fg:#f9e2af bg:#a6e3a1)"
+          "$nodejs"
+          "$rust"
+          "$golang"
+          "$php"
+          "[](fg:#a6e3a1)"
+          "$line_break"
+          "$character"
+        ];
+        directory = {
+          style = "fg:#1e1e2e bg:#fab387";
+          format = "[ $path ]($style)";
+          truncation_length = 3;
+          truncation_symbol = "…/";
+          substitutions = {
+            "Documents" = "󰈙 ";
+            "Downloads" = " ";
+            "Music" = " ";
+            "Pictures" = " ";
+          };
+        };
+        git_branch = {
+          symbol = "";
+          style = "bg:#f9e2af";
+          format = "[[ $symbol $branch ](fg:#1e1e2e bg:#f9e2af)]($style)";
+        };
+        git_status = {
+          style = "bg:#f9e2af";
+          format = "[[($all_status$ahead_behind )](fg:#1e1e2e bg:#f9e2af)]($style)";
+        };
+        nodejs = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = "[[ $symbol ($version) ](fg:#1e1e2e bg:#a6e3a1)]($style)";
+        };
+        rust = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = ''[[ $symbol ($version) ](fg:#1e1e2e bg:#a6e3a1)]($style)'';
+        };
+        golang = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = "[[ $symbol ($version) ](fg:#1e1e2e bg#a6e3a1)]($style)";
+        };
+        php = {
+          symbol = "";
+          style = "bg:#a6e3a1";
+          format = "[[ $symbol ($version) ](fg:#1e1e2e bg:#a6e3a1)]($style)";
+        };
+        scan_timeout = 100;
+      };
+    };
     zsh = {
       enable = true;
       enableCompletion = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
-      sessionVariables = {
-        SSH_AUTH_SOCK = "/home/eclypse/.bitwarden-ssh-agent.sock";
+      shellAliases = {
+        stu = "ssh stu";
       };
     };
   };

modules/system/default.nix

@@ -5,6 +5,7 @@
   imports = [
     ./agenix.nix
     ./boot.nix
+    ./desktop.nix
     ./fileSystems.nix
     ./fonts.nix
     ./network.nix
@@ -14,6 +15,6 @@
     ./system.nix
     ./tailscale.nix
     ./user.nix
-    ./virtualisation.nix
+    # ./virtualisation.nix
   ];
 }

modules/system/desktop.nix

@@ -0,0 +1,54 @@
+{
+  inputs,
+  pkgs,
+  ...
+}:
+let
+  sddm-theme = inputs.silentSDDM.packages.${pkgs.system}.default;
+in
+{
+  imports = [
+    inputs.mango.nixosModules.mango
+  ];
+
+  programs = {
+    hyprland = {
+      enable = true;
+      package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+    };
+    mango.enable = true;
+  };
+
+  environment.systemPackages = [
+    sddm-theme
+    sddm-theme.test
+  ];
+
+  services.displayManager = {
+    defaultSession = "mango";
+    sddm = {
+      enable = true;
+      package = pkgs.kdePackages.sddm;
+      theme = sddm-theme.pname;
+      extraPackages = sddm-theme.propagatedBuildInputs;
+      settings = {
+        General = {
+          GreeterEnvironment = "QML2_IMPORT_PATH=${sddm-theme}/share/sddm/themes/${sddm-theme.pname}/components/,QT_IM_MODULE=qtvirtualkeyboard";
+          InputMethod = "qtvirtualkeyboard";
+        };
+      };
+    };
+  };
+
+  # Enable the KDE Plasma Desktop Environment.
+  # displayManager.sddm.enable = true;
+  # desktopManager.plasma5.enable = true;
+
+  # Enable the System75 Cosmic Desktop Environment
+  # displayManager.cosmic-greeter.enable = true;
+  # desktopManager.cosmic = {
+  #   enable = true;
+  #   xwayland.enable = true;
+  # };
+}

modules/system/security.nix

@@ -2,7 +2,16 @@
   ...
 }:
 {
+  programs = {
+    yubikey-manager.enable = true;
+    yubikey-touch-detector.enable = true;
+  };
+
+  services = {
+    yubikey-agent.enable = true;
+  };
+
   security = {
     rtkit.enable = true;
   };
-}
+}

modules/system/services.nix

@@ -1,4 +1,5 @@
 {
+  pkgs,
   ...
 }:
 {
@@ -18,12 +19,20 @@
       # libinput.enable = true;
     };
 
-    # Enable the KDE Plasma Desktop Environment.
-    displayManager.sddm.enable = true;
-    desktopManager.plasma6.enable = true;
-
     # Enable CUPS to print documents.
-    printing.enable = true;
+    printing = {
+      enable = true;
+      drivers = with pkgs; [
+        gutenprint
+        cnijfilter2
+      ];
+    };
+
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
 
     # Enable sound with pipewire.
     pulseaudio.enable = false;
@@ -50,4 +59,14 @@
       };
     };
   };
+
+  hardware = {
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+    sane = {
+      enable = true;
+    };
+  };
 }

modules/system/system.nix

@@ -14,11 +14,13 @@
         "https://cache.nixos.org"
         "https://nix-community.cachix.org"
         "https://devenv.cachix.org"
+        "https://hyprland.cachix.org"
       ];
       trusted-public-keys = [
         "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
     };
   };

modules/system/user.nix

@@ -23,7 +23,7 @@
       programs.home-manager.enable = true;
     };
 
-    backupFileExtension = "backup18";
+    backupFileExtension = "backup";
   };
 
   users.mutableUsers = false;
@@ -34,6 +34,8 @@
     extraGroups = [
       "networkmanager"
       "wheel"
+      "scanner"
+      "lp"
     ];
     hashedPasswordFile = config.age.secrets.eclypse-password.path;
     shell = pkgs.zsh;