diff --git a/flake.lock b/flake.lock index fb154c1..7420ff7 100644 --- a/flake.lock +++ b/flake.lock @@ -45,16 +45,16 @@ ] }, "locked": { - "lastModified": 1702195668, - "narHash": "sha256-Lxmjez0nfNBptdqV5GsXKm7Bb7swjGsrxiLxWJu0tL8=", + "lastModified": 1703113038, + "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=", "owner": "nix-community", "repo": "home-manager", - "rev": "33110fb3c7fe6a94b98b641866a5eddb64b7c23f", + "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -139,16 +139,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1703034876, - "narHash": "sha256-4bMPFv/bs5g1nEsXQwXlrAGJgjv1Ilr0ejdaTkBwQLs=", + "lastModified": 1703068421, + "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "312ab59e8ade69e6083017bd9b98a2919f1fb86a", + "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 280ad6f..f2e906f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,14 @@ description = "Sigma dotfiles"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; ecsls.url = "github:Sigmapitech-meta/ecsls"; hosts.url = "github:StevenBlack/hosts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/home/default.nix b/home/default.nix index 6562de5..8ecb093 100644 --- a/home/default.nix +++ b/home/default.nix @@ -36,8 +36,8 @@ packages = let - figma-linux-wrap = pkgs.figma-linux.overrideAttrs (prev: { - nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.wrapGAppsHook ]; + figma-linux-wrap = with pkgs; figma-linux.overrideAttrs (prev: { + nativeBuildInputs = prev.nativeBuildInputs ++ [ wrapGAppsHook ]; }); in diff --git a/home/zsh/default.nix b/home/zsh/default.nix index d51982b..bd37728 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -4,7 +4,7 @@ enable = true; enableAutosuggestions = true; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; plugins = [ { diff --git a/system/default.nix b/system/default.nix index 9562669..e7b0ee1 100644 --- a/system/default.nix +++ b/system/default.nix @@ -41,14 +41,6 @@ allowUnfree = true; pulseaudio = true; }; - - overlays = [ - (_: super: { - nix-direnv = super.nix-direnv.override { - enableFlakes = true; - }; - }) - ]; }; networking = { @@ -157,7 +149,6 @@ windowManager.qtile = { enable = true; backend = "x11"; - extraPackages = pypkgs: [ pypkgs.qtile-extras ]; }; }; @@ -171,8 +162,11 @@ initialPassword = "hello"; }; - fonts.fonts = with pkgs; [ - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + fonts.packages = with pkgs; let + jetbrains-mono-nerd-font = (nerdfonts.override + { fonts = [ "JetBrainsMono" ]; }); + in [ + jetbrains-mono-nerd-font dina-font fira-code fira-code-symbols @@ -234,13 +228,11 @@ }; qt.style = "adwaita-dark"; - xdg = { - portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - ]; - }; + xdg.portal = { + enable = true; + config.common.default = "*"; + extraPortals = [ + pkgs.xdg-desktop-portal-kde + ]; }; }