diff --git a/flake.lock b/flake.lock index 1c7984d..897b8c2 100644 --- a/flake.lock +++ b/flake.lock @@ -28,16 +28,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -60,27 +60,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733384649, - "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733622286, - "narHash": "sha256-oCIkFVqQcjvtU3c4TTN7hRekSr+wlTVL2whMsXUKg1A=", + "lastModified": 1733670498, + "narHash": "sha256-2LT4XkhaO0cIWKjOvsyKX0rmDRhwVMTrNBL/HH6609E=", "owner": "nix-community", "repo": "NUR", - "rev": "70703de1f38d9b491edd255ddec455a31529544c", + "rev": "15c49dc4bf252830b7e95f12b0368ae6e010bff9", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "unstable-pkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c37bb7c..dd8bb98 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My nixos config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; unstable-pkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nur = { @@ -13,7 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/modules/hardware/gui.nix b/modules/hardware/gui.nix index 65de837..3331755 100644 --- a/modules/hardware/gui.nix +++ b/modules/hardware/gui.nix @@ -2,7 +2,7 @@ { hardware = { - opengl = { + graphics = { enable = true; }; }; @@ -12,13 +12,13 @@ i3status i3lock libnotify - gnome3.adwaita-icon-theme + adwaita-icon-theme dunst arandr autorandr udiskie pasystray - gnome.nautilus + nautilus ]; }; services = { diff --git a/modules/hardware/keyboard.nix b/modules/hardware/keyboard.nix index 5c15a75..9a4d0fd 100644 --- a/modules/hardware/keyboard.nix +++ b/modules/hardware/keyboard.nix @@ -51,5 +51,5 @@ ]; }; }; - sound.mediaKeys.enable = true; + #sound.mediaKeys.enable = true; } diff --git a/modules/hardware/sound.nix b/modules/hardware/sound.nix index bb7795b..f8f0062 100644 --- a/modules/hardware/sound.nix +++ b/modules/hardware/sound.nix @@ -9,7 +9,7 @@ }; hardware = { pulseaudio = { - enable = true; + enable = false; support32Bit = true; package = pkgs.pulseaudioFull; }; diff --git a/modules/hardware/yubikey.nix b/modules/hardware/yubikey.nix index 758ebd5..ca15b9b 100644 --- a/modules/hardware/yubikey.nix +++ b/modules/hardware/yubikey.nix @@ -33,14 +33,16 @@ in }; security = { pam = { + services.login.u2fAuth = true; sshAgentAuth = { enable = true; }; u2f = { - enable = true; - control = "required"; - cue = true; - authFile = authFile; + enable = true; + control = "required"; + settings = { + authfile = authFile; + }; }; }; }; diff --git a/modules/purposes/gaming/gaming.nix b/modules/purposes/gaming/gaming.nix index 0ef375b..96d71db 100644 --- a/modules/purposes/gaming/gaming.nix +++ b/modules/purposes/gaming/gaming.nix @@ -11,8 +11,8 @@ }; hardware = { - opengl = { - driSupport32Bit = true; + graphics = { + enable32Bit = true; extraPackages32 = [ pkgs.pkgsi686Linux.libva ]; }; }; diff --git a/modules/purposes/home-office/home-printer.nix b/modules/purposes/home-office/home-printer.nix index 254be92..90f7ae0 100644 --- a/modules/purposes/home-office/home-printer.nix +++ b/modules/purposes/home-office/home-printer.nix @@ -4,7 +4,7 @@ config = mylib.mkIfComputerHasPurpose "home-office" { environment = { systemPackages = with pkgs; [ - gnome.simple-scan + simple-scan ]; }; services = { diff --git a/modules/purposes/work/firefox.nix b/modules/purposes/work/firefox.nix index 940cb86..7341a76 100644 --- a/modules/purposes/work/firefox.nix +++ b/modules/purposes/work/firefox.nix @@ -5,7 +5,7 @@ in { config = mylib.mkIfComputerHasPurpose "work" { home-manager.users.xadet = { ... }: { - programs.firefox.profiles = { + programs.firefox.profiles = lib.mkForce { "perso".isDefault = false; "eove" = { id = 1; diff --git a/modules/system/fonts.nix b/modules/system/fonts.nix index fd127c4..962ca45 100644 --- a/modules/system/fonts.nix +++ b/modules/system/fonts.nix @@ -14,7 +14,7 @@ packages = with pkgs; [ nerdfonts noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code diff --git a/modules/system/home-manager/shells/default.nix b/modules/system/home-manager/shells/default.nix index 638f68f..338413d 100644 --- a/modules/system/home-manager/shells/default.nix +++ b/modules/system/home-manager/shells/default.nix @@ -46,9 +46,6 @@ fd = { enable = true; }; - taskwarrior = { - enable = true; - }; zoxide = { enable = true; options = [ "--cmd cd" ]; diff --git a/modules/system/home-manager/shells/wezterm.nix b/modules/system/home-manager/shells/wezterm.nix index 37507f8..bcab308 100644 --- a/modules/system/home-manager/shells/wezterm.nix +++ b/modules/system/home-manager/shells/wezterm.nix @@ -9,6 +9,7 @@ in return { font = wezterm.font "${font}", font_size = 18, + front_end = "WebGpu", scrollback_lines = 20000, color_scheme = 'Darcula (base16)', keys = { diff --git a/modules/system/shells.nix b/modules/system/shells.nix index 6cb9c6c..6b7e397 100644 --- a/modules/system/shells.nix +++ b/modules/system/shells.nix @@ -8,7 +8,9 @@ }; programs = { bash = { - enableCompletion = true; + completion = { + enable = true; + }; }; fish = { enable = true;