diff --git a/flake.lock b/flake.lock index ef9ae64..f46cbaa 100644 --- a/flake.lock +++ b/flake.lock @@ -97,11 +97,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1734235408, - "narHash": "sha256-0yHVZ2+VaW36/RTGHm1x3p+KS1oAWIj+TWObLDUzHfQ=", + "lastModified": 1734863027, + "narHash": "sha256-L2Yqu7PVbzlxp37kmTGTA3gOceu7VLRuebm1DHiKPg4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "02261a5dd442b8c6eb778c31e7967e734bc2ff76", + "rev": "5a5aea6627a4c360ba030ddadeda63d1ad294125", "type": "gitlab" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734017764, - "narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=", + "lastModified": 1734529975, + "narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b", + "rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -500,11 +500,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110168, - "narHash": "sha256-Q0eeLYn45ErXlqGQyXmLLHGe1mqnUiK0Y9wZRa1SNFI=", + "lastModified": 1734822296, + "narHash": "sha256-zYGz8vgtyha4TsrSUPmcfPAb0IlYADZy4KjeXI9Z+u8=", "owner": "danth", "repo": "stylix", - "rev": "a9e3779949925ef22f5a215c5f49cf520dea30b1", + "rev": "4f489c63932f014be856475154bf342f8a40f5ff", "type": "github" }, "original": { diff --git a/hosts/phone/home.nix b/hosts/phone/home.nix index 13a8cc6..e2fede2 100644 --- a/hosts/phone/home.nix +++ b/hosts/phone/home.nix @@ -1,5 +1,4 @@ {...}: { - # home.enableNixpkgsReleaseCheck = false; imports = [ ../../modules/programs/bat ../../modules/programs/yazi diff --git a/modules/programs/btop/default.nix b/modules/programs/btop/default.nix index ee12f92..4f1a73b 100644 --- a/modules/programs/btop/default.nix +++ b/modules/programs/btop/default.nix @@ -1,3 +1,5 @@ { - programs.btop.enable = true; + programs.btop = { + enable = true; + }; } diff --git a/modules/programs/zoxide/default.nix b/modules/programs/zoxide/default.nix index c4b4530..3b81ab7 100644 --- a/modules/programs/zoxide/default.nix +++ b/modules/programs/zoxide/default.nix @@ -1,3 +1,5 @@ { - programs.zoxide.enable = true; + programs.zoxide = { + enable = true; + }; } diff --git a/modules/wm/dunst/default.nix b/modules/wm/dunst/default.nix index b6ce7a5..959df19 100644 --- a/modules/wm/dunst/default.nix +++ b/modules/wm/dunst/default.nix @@ -13,15 +13,14 @@ enable = true; settings = { global = { - background = "#282828"; - foreground = "#D5C4A1"; - geometry = "300x60-3+200"; + background = "#${config.home-manager.users.${username}.stylix.base16Scheme.base01}"; + foreground = "#${config.home-manager.users.${username}.stylix.base16Scheme.base05}"; padding = 8; horizontal_padding = 8; separator_height = 2; frame_width = 4; corner_radius = 5; - font = "DejaVuSansMono 12"; + font = "${config.home-manager.users.${username}.stylix.fonts.monospace.name} 12"; alignment = "center"; vertical_alignment = "center"; ellipsize = "middle"; @@ -29,15 +28,15 @@ }; urgency_low = { - frame_color = "#98971a"; + frame_color = "#${config.home-manager.users.${username}.stylix.base16Scheme.base0B}"; }; urgency_normal = { - frame_color = "#458588"; + frame_color = "#${config.home-manager.users.${username}.stylix.base16Scheme.base0D}"; }; urgency_critical = { - frame_color = "#98971a"; + frame_color = "#${config.home-manager.users.${username}.stylix.base16Scheme.base08}"; }; }; }; diff --git a/modules/wm/gdm/default.nix b/modules/wm/gdm/default.nix index 2a58225..773dbcd 100644 --- a/modules/wm/gdm/default.nix +++ b/modules/wm/gdm/default.nix @@ -10,6 +10,7 @@ config = lib.mkIf config.gdm.enable { services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; + services.displayManager.defaultSession = "hyprland"; services.displayManager.autoLogin.enable = true; services.displayManager.autoLogin.user = username; diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix index 9778c50..5de090b 100644 --- a/modules/wm/hyprland/default.nix +++ b/modules/wm/hyprland/default.nix @@ -61,12 +61,11 @@ border_size = 4; allow_tearing = false; layout = "master"; - # "col.active_border" = "${config.home-manager.users.${username}.stylix.base16Scheme.base0D}"; - # "col.inactive_border" = "${config.home-manager.users.${username}.stylix.base16Scheme.base03}"; }; misc = { disable_hyprland_logo = true; disable_splash_rendering = true; + disable_hyprland_qtutils_check = true; }; decoration = { rounding = 5;