diff --git a/flake.lock b/flake.lock index 5feca12..6ed1cdf 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -34,30 +34,14 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { @@ -66,50 +50,18 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -157,11 +109,11 @@ ] }, "locked": { - "lastModified": 1731274291, - "narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=", + "lastModified": 1732221404, + "narHash": "sha256-fWTyjgGt+BHmkeJ5IxOR4zGF4/uc+ceWmhBjOBSVkgQ=", "owner": "nix-community", "repo": "disko", - "rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc", + "rev": "97c0c4d7072f19b598ed332e9f7f8ad562c6885b", "type": "github" }, "original": { @@ -259,14 +211,35 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -322,11 +295,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731479417, - "narHash": "sha256-NZ+Jc9XecxUIC6RBE5TdDo8hKzI704fMBKTz6lEH32w=", + "lastModified": 1732245156, + "narHash": "sha256-XvaLpvmtGH3DZZ0wjjEc4czzfv3bj3+t3/LipuLMzbU=", "owner": "helix-editor", "repo": "helix", - "rev": "6cca98264fe308bd6a4f7f85be2d821b58f60b4a", + "rev": "dc941d6d24cd4876f75e68487047542239b8316a", "type": "github" }, "original": { @@ -342,16 +315,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1731880681, + "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -364,11 +337,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -426,11 +399,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1731425281, - "narHash": "sha256-azk9oxzHkfYZcgBzAK3J9qdUQG0UjLSOjt8KzJ9rb8g=", + "lastModified": 1731843871, + "narHash": "sha256-aIy8m4jjr/BFXzniNzoH16sF7HEFV/01/5b3FhtUHrw=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "505386dda29452140f93734509b03de57986af57", + "rev": "5a1c2a28589e34f8a44d46dd1909cfacf928cb1a", "type": "github" }, "original": { @@ -441,11 +414,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -486,29 +459,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -520,16 +477,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -647,15 +604,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1732186149, + "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "type": "github" }, "original": { @@ -668,29 +624,30 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_3", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1718122552, - "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", + "lastModified": 1732261424, + "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", "owner": "danth", "repo": "stylix", - "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", + "rev": "b667a340730dd3d0596083aa7c949eef01367c62", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.05", "repo": "stylix", "type": "github" } @@ -725,13 +682,78 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "ucodenix": { "locked": { - "lastModified": 1731510725, - "narHash": "sha256-kTX8QHL5PStzyITF47l6G/KvDjORuojX9NPNTccUtdA=", + "lastModified": 1731964325, + "narHash": "sha256-uPIlQS1KJd+IjYOM/eH0xpkP47jEFM4NL+A+n1NW/Jw=", "owner": "e-tho", "repo": "ucodenix", - "rev": "7d7586d3fcd07e147c0dba9291b2473e060c4c98", + "rev": "060776365bacf9340886c1ba851ac573a21a12a2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 92f4ec3..396b49f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # NixOS disko = { @@ -28,7 +28,7 @@ # nur.url = "github:nix-community/NUR"; # Home Manager home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; # hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; @@ -52,9 +52,10 @@ # nixvim-flake.url = "github:arunoruto/nvim.nix"; # Styling stylix = { - # url = "github:danth/stylix"; - url = "github:danth/stylix/release-24.05"; + url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; + # url = "github:danth/stylix/release-24.05"; + # inputs.nixpkgs.follows = "nixpkgs"; }; # ags.url = "github:Aylur/ags"; # poetry2nix = { diff --git a/modules/home-manager/pc/desktop/hyprland/lock.nix b/modules/home-manager/pc/desktop/hyprland/lock.nix index da6cd39..6c4efbc 100644 --- a/modules/home-manager/pc/desktop/hyprland/lock.nix +++ b/modules/home-manager/pc/desktop/hyprland/lock.nix @@ -38,9 +38,9 @@ in dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0 dots_center = true; - outer_color = "rgba(0, 0, 0, 0)"; - inner_color = "rgba(0, 0, 0, 0.5)"; - font_color = "rgb(200, 200, 200)"; + # outer_color = "rgba(0, 0, 0, 0)"; + # inner_color = "rgba(0, 0, 0, 0.5)"; + # font_color = "rgb(200, 200, 200)"; fade_on_empty = false; # font_family = font; placeholder_text = ''Input Password...''; diff --git a/modules/home-manager/pc/desktop/hyprland/paper.nix b/modules/home-manager/pc/desktop/hyprland/paper.nix index f2fabc1..52db4f5 100644 --- a/modules/home-manager/pc/desktop/hyprland/paper.nix +++ b/modules/home-manager/pc/desktop/hyprland/paper.nix @@ -5,7 +5,7 @@ }: { imports = [ - ./paper-stylix.nix + # ./paper-stylix.nix ]; options.hypr.paper.enable = lib.mkEnableOption "Configure hyprpaper for wallpaper settings"; diff --git a/modules/home-manager/pc/terminal/wezterm.nix b/modules/home-manager/pc/terminal/wezterm.nix index 42786a9..3dcd952 100644 --- a/modules/home-manager/pc/terminal/wezterm.nix +++ b/modules/home-manager/pc/terminal/wezterm.nix @@ -15,6 +15,7 @@ local config = {} config.audible_bell = "Disabled" config.enable_wayland = false + config.front_end = "WebGpu" config.hide_tab_bar_if_only_one_tab = true -- config.window_decorations = 'TITLE | RESIZE' config.window_decorations = 'RESIZE' diff --git a/modules/home-manager/theming/cursors.nix b/modules/home-manager/theming/cursors.nix index e9db102..cfcf9e5 100644 --- a/modules/home-manager/theming/cursors.nix +++ b/modules/home-manager/theming/cursors.nix @@ -9,8 +9,10 @@ config = lib.mkIf config.theming.cursors.enable { stylix.cursor = { - name = "catppuccin-macchiato-dark-cursors"; - package = pkgs.catppuccin-cursors.macchiatoDark; + # name = "catppuccin-macchiato-dark-cursors"; + # package = pkgs.catppuccin-cursors.macchiatoDark; + name = "Banana"; + package = pkgs.banana-cursor; size = 24; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index b2b2ed7..0655abd 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -17,9 +17,9 @@ ./services ./system - # ./pr.nix - ./user.nix + + # ./pr.nix ]; desktop-environment.enable = lib.mkDefault true; diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix index 91bbaf2..dfdb329 100644 --- a/modules/nixos/desktop/gnome.nix +++ b/modules/nixos/desktop/gnome.nix @@ -28,12 +28,12 @@ gnome-network-displays gthumb nautilus-open-any-terminal - gnome.nautilus-python - gnome.gnome-software - gnome.pomodoro - gnome.gnome-remote-desktop - gnome3.gnome-tweaks - gnome.zenity + nautilus-python + gnome-software + gnome-pomodoro + gnome-remote-desktop + gnome-tweaks + zenity ]; # Excluding some GNOME applications from the default install gnome.excludePackages = @@ -41,7 +41,7 @@ gnome-photos gnome-tour ]) - ++ (with pkgs.gnome; [ + ++ (with pkgs; [ #cheese # webcam tool gnome-music gnome-terminal diff --git a/modules/nixos/display/gdm.nix b/modules/nixos/display/gdm.nix index 73cdde7..ddc5ce0 100644 --- a/modules/nixos/display/gdm.nix +++ b/modules/nixos/display/gdm.nix @@ -20,7 +20,8 @@ }; programs = { - ssh.askPassword = lib.mkForce "${pkgs.gnome.seahorse.out}/bin/seahorse"; + # ssh.askPassword = lib.mkForce "${pkgs.seahorse.out}/bin/seahorse"; + ssh.askPassword = lib.mkForce "${lib.getExe pkgs.seahorse}"; dconf.profiles.gdm.databases = [ { settings = { diff --git a/modules/nixos/environment/programming/python.nix b/modules/nixos/environment/programming/python.nix index 7c3c288..8acb919 100644 --- a/modules/nixos/environment/programming/python.nix +++ b/modules/nixos/environment/programming/python.nix @@ -21,7 +21,7 @@ let numpy pandas plotly - streamlit + # streamlit # Misc manim psutil diff --git a/modules/nixos/security/fingerprint.nix b/modules/nixos/security/fingerprint.nix index feb6344..fd15a7e 100644 --- a/modules/nixos/security/fingerprint.nix +++ b/modules/nixos/security/fingerprint.nix @@ -38,50 +38,30 @@ ## https://github.com/NixOS/nixpkgs/issues/171136#issuecomment-1627779037 # similarly to how other distributions handle the fingerprinting login - # gdm-fingerprint = lib.mkIf config.services.fprintd.enable { - # text = '' + # gdm-fingerprint.text = lib.mkIf config.services.fprintd.enable ( + # '' # auth required pam_shells.so # auth requisite pam_nologin.so # auth requisite pam_faillock.so preauth # auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so - # auth optional pam_permit.so # auth required pam_env.so - # auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so - # auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so + # '' + # + lib.optionalString config.security.pam.services.login.enableGnomeKeyring '' + # auth [success=ok default=1] ${pkgs.gdm}/lib/security/pam_gdm.so + # auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so + # '' + # + '' # account include login # password required pam_deny.so # session include login - # session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start - # ''; - # }; - - gdm-fingerprint.text = lib.mkIf config.services.fprintd.enable ( - '' - auth required pam_shells.so - auth requisite pam_nologin.so - auth requisite pam_faillock.so preauth - auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so - auth required pam_env.so - '' - + lib.optionalString config.security.pam.services.login.enableGnomeKeyring '' - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so - auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so - '' - + '' - - account include login - - password required pam_deny.so - - session include login - '' - # + lib.optionalString config.security.pam.services.login.enableGnomeKeyring '' - # session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start - # '' - ); + # '' + # # + lib.optionalString config.security.pam.services.login.enableGnomeKeyring '' + # # session optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start + # # '' + # ); }; ## we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware diff --git a/modules/nixos/services/media/sound.nix b/modules/nixos/services/media/sound.nix index 8fa69fa..d621dc7 100644 --- a/modules/nixos/services/media/sound.nix +++ b/modules/nixos/services/media/sound.nix @@ -9,7 +9,7 @@ }; config = lib.mkIf config.pipewire.enable { # Enable sound with pipewire. - sound.enable = lib.mkForce false; + # sound.enable = lib.mkForce false; hardware.pulseaudio.enable = false; # rtkit is optional but recommended security.rtkit.enable = true; diff --git a/modules/nixos/system/amd/default.nix b/modules/nixos/system/amd/default.nix index 5950a8e..e769ad1 100644 --- a/modules/nixos/system/amd/default.nix +++ b/modules/nixos/system/amd/default.nix @@ -36,7 +36,7 @@ hardware.opengl = { enable = true; - driSupport = true; + # driSupport = true; driSupport32Bit = true; extraPackages = (with pkgs; [ diff --git a/modules/nixos/system/theming.nix b/modules/nixos/system/theming.nix index e91a38e..cb2f8ee 100644 --- a/modules/nixos/system/theming.nix +++ b/modules/nixos/system/theming.nix @@ -40,8 +40,9 @@ base16Scheme = lib.mkDefault "${pkgs.unstable.base16-schemes}/share/themes/${config.theming.scheme}.yaml"; image = inputs.wallpapers + "/${config.theming.image}"; polarity = config.home-manager.users.${username}.stylix.polarity; - cursor = lib.optionalAttrs (config.programs.enable - ) config.home-manager.users.${username}.stylix.cursor; + cursor = + lib.optionalAttrs config.programs.enable + config.home-manager.users.${username}.stylix.cursor; # if (config.programs.enable) then config.home-manager.users.${username}.stylix.cursor else { }; # fonts = # if (config.gui.enable) diff --git a/modules/nixos/user.nix b/modules/nixos/user.nix index a95f347..247c352 100644 --- a/modules/nixos/user.nix +++ b/modules/nixos/user.nix @@ -39,7 +39,10 @@ in }; }; - programs.zsh.enable = true; + # programs.${shell}.enable = lib.mkForce true; + programs = { + fish.enable = true; + }; environment = { sessionVariables.FLAKE = "/home/${username}/.config/flake";