chore: enable docker

refactor: hjemify foot & keepassxc
fix: move natural scroll to touchpad
2025-02-22 17:51:28 +01:00 · 2025-02-22 17:31:54 +01:00 · 2025-02-22 17:31:34 +01:00 · 2025-02-22 16:47:15 +01:00
17 changed files with 159 additions and 90 deletions
--- a/flake.lock
+++ b/flake.lock
@ -156,6 +156,49 @@
        "type": "github"
      }
    },
+    "hjem": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737619027,
+        "narHash": "sha256-jEzZs9dHdmVP5X9HCC/7jrv08aWFfqZV5cZ+cZWYGA4=",
+        "owner": "feel-co",
+        "repo": "hjem",
+        "rev": "48cfa21987672a31a358b7e4d582fc174556e633",
+        "type": "github"
+      },
+      "original": {
+        "owner": "feel-co",
+        "repo": "hjem",
+        "type": "github"
+      }
+    },
+    "hjem-rum": {
+      "inputs": {
+        "hjem": [
+          "hjem"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738790283,
+        "narHash": "sha256-SKz3KfmK7iupR+Ef022pQQZccxXlm/2w5HxpSv+PAGE=",
+        "owner": "nydragon",
+        "repo": "hjem-rum",
+        "rev": "ac4bf585731b813ad37cb3822ad44b1e3bb16a7e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nydragon",
+        "repo": "hjem-rum",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -340,6 +383,8 @@
        "agenix": "agenix",
        "disko": "disko",
        "flake-parts": "flake-parts",
+        "hjem": "hjem",
+        "hjem-rum": "hjem-rum",
        "home-manager": "home-manager",
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs_2",
--- a/flake.nix
+++ b/flake.nix
@ -35,6 +35,16 @@
      url = "git+https://git.ccnlc.eu/nydragon/nur.git";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+
+    hjem = {
+      url = "github:feel-co/hjem";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hjem-rum = {
+      url = "github:nydragon/hjem-rum";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.hjem.follows = "hjem";
+    };
  };

  outputs =
--- a/home/default.nix
+++ b/home/default.nix
@ -7,7 +7,6 @@
    ./hyprland
    ./hyprlock
    ./services
-    ./foot.nix
    ./rofi
    ./sway
    ./waybar
--- a/home/graphical/default.nix
+++ b/home/graphical/default.nix
@ -6,7 +6,6 @@
    ./fuzzel.nix
    ./gammastep.nix # default because I need to protect my peepers
    ./swww.nix
-    ./keepassxc.nix
    ./swayidle.nix
    ./swaylock.nix
  ];
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@ -35,7 +35,7 @@ mkIf osConfig.programs.hyprland.enable {

      general = {
        gaps_in = 3;
-        gaps_out = 10;
+        gaps_out = 3;

        border_size = 2;

@ -56,6 +56,9 @@ mkIf osConfig.programs.hyprland.enable {
        numlock_by_default = true;
        kb_options = "compose:caps";
        kb_layout = osConfig.console.keyMap;
+        touchpad = {
+          natural_scroll = true;
+        };
      };

      decoration = {
@ -131,6 +134,9 @@ mkIf osConfig.programs.hyprland.enable {
        preserve_split = true;
      };

+      gestures = {
+        workspace_swipe = true;
+      };
      # https://wiki.hyprland.org/Configuring/Variables/#misc
      misc = {
        force_default_wallpaper = 0;
@ -141,64 +147,67 @@ mkIf osConfig.programs.hyprland.enable {

      bindm = [ "$mod,mouse:272,movewindow" ];

-      bind =
-        [
-          "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
-          "$mod, E, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.filemanager}"
-          "$mod, Return, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.terminal}"
-          "$mod SHIFT, Q, killactive,"
-          "$mod, V, togglefloating"
-          "$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
-          "$mod, P, exec, ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.hyprlock}/bin/hyprlock"
-          "$mod SHIFT, C, exec, hyprctl reload"
-          "$mod SHIFT, space, togglefloating"
-          "$mod, left, movefocus, l"
-          "$mod, right, movefocus, r"
-          "$mod, up, movefocus, u"
-          "$mod, down, movefocus, d"
+      bind = [
+        "$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
+        "$mod, E, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.filemanager}"
+        "$mod, Return, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.terminal}"
+        "$mod SHIFT, Q, killactive,"
+        "$mod, V, togglefloating"
+        "$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
+        "$mod, P, exec, ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.hyprlock}/bin/hyprlock"
+        "$mod SHIFT, C, exec, hyprctl reload"
+        "$mod SHIFT, space, togglefloating"
+        "$mod, left, movefocus, l"
+        "$mod, right, movefocus, r"
+        "$mod, up, movefocus, u"
+        "$mod, down, movefocus, d"

-          # Example special workspace (scratchpad)
-          "$mod, S, togglespecialworkspace, magic"
-          "$mod SHIFT, S, movetoworkspace, special:magic"
-          "$mod, X, fullscreen, 1"
-          "$mod, F, fullscreen, 0"
-          "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
-          "$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z -o $XDG_PICTURES_DIR/screenshots -m region"
-          "$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
+        # Example special workspace (scratchpad)
+        "$mod, S, togglespecialworkspace, magic"
+        "$mod SHIFT, S, movetoworkspace, special:magic"
+        "$mod, X, fullscreen, 1"
+        "$mod, F, fullscreen, 0"
+        "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
+        "$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z -o $XDG_PICTURES_DIR/screenshots -m region"
+        "$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"

-          #: Brightness and Media {{{
-          ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%"
-          ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%-"
-          ",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
-          ",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
-          ",XF86AudioMicMute, exec, ${pkgs.pamixer}/bin/pamixer --default-source -m"
-          ",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t"
-          ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
-          ",XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
-          ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
-          ",XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous"
-          #: }}}
-        ]
-        ++ (
-          # workspaces
-          # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-          builtins.concatLists (
-            builtins.genList (
-              x:
-              let
-                ws =
-                  let
-                    c = (x + 1) / 10;
-                  in
-                  builtins.toString (x + 1 - (c * 10));
-              in
-              [
-                "$mod, ${ws}, workspace, ${toString (x + 1)}"
-                "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
-              ]
-            ) 10
-          )
-        );
+        #: Brightness and Media {{{
+        ",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%"
+        ",XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 10%-"
+        ",XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5"
+        ",XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5"
+        ",XF86AudioMicMute, exec, ${pkgs.pamixer}/bin/pamixer --default-source -m"
+        ",XF86AudioMute, exec, ${pkgs.pamixer}/bin/pamixer -t"
+        ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
+        ",XF86AudioPause, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
+        ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next"
+        ",XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous"
+        #: }}}
+
+        # Workspaces
+        "$mod, code:10, workspace, 1"
+        "$mod, code:11, workspace, 2"
+        "$mod, code:12, workspace, 3"
+        "$mod, code:13, workspace, 4"
+        "$mod, code:14, workspace, 5"
+        "$mod, code:15, workspace, 6"
+        "$mod, code:16, workspace, 7"
+        "$mod, code:17, workspace, 8"
+        "$mod, code:18, workspace, 9"
+        "$mod, code:19, workspace, 10"
+
+        # Send to Workspaces
+        "$mod SHIFT, code:10, movetoworkspace, 1"
+        "$mod SHIFT, code:11, movetoworkspace, 2"
+        "$mod SHIFT, code:12, movetoworkspace, 3"
+        "$mod SHIFT, code:13, movetoworkspace, 4"
+        "$mod SHIFT, code:14, movetoworkspace, 5"
+        "$mod SHIFT, code:15, movetoworkspace, 6"
+        "$mod SHIFT, code:16, movetoworkspace, 7"
+        "$mod SHIFT, code:17, movetoworkspace, 8"
+        "$mod SHIFT, code:18, movetoworkspace, 9"
+        "$mod SHIFT, code:19, movetoworkspace, 10"
+      ];
    };
  };
 }
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@ -5,7 +5,6 @@
    ./git
    ./fish
    ./btop.nix
-    ./hyfetch.nix
    ./beets.nix
  ];
 }
--- a/home/terminal/hyfetch.nix
+++ b/home/terminal/hyfetch.nix
@ -1,15 +0,0 @@
-{
-  programs.fastfetch.enable = true;
-  programs.hyfetch = {
-    enable = true;
-    settings = {
-      mode = "rgb"; # dunno the other value :sob:
-      lightness = 0.7; # u may change this
-      distro = "nixos";
-      preset = "pansexual"; # sexuality
-      light_dark = "dark"; # u not crazy are u
-      backend = "fastfetch";
-      color_align.mode = "horizontal"; # looks better
-    };
-  };
-}
--- a/hosts/brontes/default.nix
+++ b/hosts/brontes/default.nix
@ -12,6 +12,7 @@ in
  imports = [
    ./hardware-configuration.nix
    ./home.nix
+    ../../users/ny
  ];

  boot.loader = {
@ -25,6 +26,14 @@ in
    group = "wheel";
  };

+  virtualisation.docker = {
+    enable = true;
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+  };
+
  services.logind = {
    powerKey = "hibernate";
  };
@ -36,7 +45,10 @@ in

  modules = {
    system = {
-      roles.desktop.enable = true;
+      roles = {
+        desktop.enable = true;
+        gaming.enable = true;
+      };

      outputs = {
        "DP-2" = {
--- a/hosts/default.nix
+++ b/hosts/default.nix
@ -25,7 +25,11 @@ in
      inherit username;
      hostname = "brontes";
      system = "x86_64-linux";
-      extraModules = [ inputs.agenix.nixosModules.default ];
+      extraModules = [
+        inputs.agenix.nixosModules.default
+        inputs.hjem.nixosModules.default
+        inputs.hjem-rum.nixosModules.default
+      ];
    })

    (mkSystem' {
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@ -20,7 +20,6 @@
    system = {
      roles = {
        desktop.enable = true;
-        gaming.enable = true;
      };

      outputs = {
--- a/modules/system/mime.nix
+++ b/modules/system/mime.nix
@ -3,7 +3,7 @@
    defaultApplications =
      let
        fileManager = "org.gnome.Nautilus.desktop";
-        browser = "firefox-beta.desktop";
+        browser = "firefox-esr.desktop";
      in
      {
        "inode/directory" = fileManager;
--- a/options/system/roles/gaming.nix
+++ b/options/system/roles/gaming.nix
@ -30,7 +30,6 @@ in
    programs.gamemode.enable = true;

    environment.systemPackages = with pkgs; [
-      lutris
      mangohud
      heroic
    ];
--- a/users/default.nix
+++ b/users/default.nix
@ -0,0 +1 @@
+{ imports = [ ./ny ]; }
--- a/users/ny/default.nix
+++ b/users/ny/default.nix
@ -0,0 +1,9 @@
+{
+  hjem = {
+    users.ny = {
+      enable = true;
+      imports = [ ./programs ];
+    };
+    clobberByDefault = true;
+  };
+}
--- a/users/ny/programs/default.nix
+++ b/users/ny/programs/default.nix
@ -0,0 +1,6 @@
+{
+  imports = [
+    ./foot.nix
+    ./keepassxc.nix
+  ];
+}
--- a/users/ny/programs/foot.nix
+++ b/users/ny/programs/foot.nix
@ -1,5 +1,5 @@
 {
-  programs.foot = {
+  rum.programs.foot = {
    enable = true;
    settings = {
      main = {
--- a/users/ny/programs/keepassxc.nix
+++ b/users/ny/programs/keepassxc.nix
@ -1,12 +1,7 @@
-{ pkgs, ... }:
-let
-  ini = pkgs.formats.ini { };
-in
 {
-  home.file."keepassxc" = {
+  rum.programs.keepassxc = {
    enable = true;
-
-    source = ini.generate "keepassxc.ini" {
+    settings = {
      General = {
        BackupBeforeSave = true;
        ConfigVersion = 2;
@ -24,7 +19,5 @@ in
        TrayIconAppearance = "colorful";
      };
    };
-
-    target = ".config/keepassxc/keepassxc.ini";
  };
 }
Author	SHA1	Message	Date
nydragon	b8781fff93	chore: enable docker Some checks failed / test (push) Failing after 2s Details	2025-02-22 17:51:28 +01:00
nydragon	3c5964ab38	refactor: hjemify foot & keepassxc	2025-02-22 17:31:54 +01:00
nydragon	eaf94d8277	fix: move natural scroll to touchpad Some checks failed / test (push) Failing after 2s Details	2025-02-22 17:31:34 +01:00
nydragon	6e3b5d3321	feat: adapt hyprland for laptop Some checks failed / test (push) Failing after 2s Details	2025-02-22 16:47:15 +01:00