diff --git a/flake.lock b/flake.lock index 0501a95..fc5a851 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1738499276, - "narHash": "sha256-w1DEom//LsBM+hQ7PO5p4tpTE7yBmW05Rgw94uPkIUY=", + "lastModified": 1738535544, + "narHash": "sha256-HR7TfT9GuQoS4bumPxhOvBuh9SaoZ98tUiyiTQ0noS4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "316741ee3d1b0f6baea9af0f177db26455bf728b", + "rev": "143eaa3fa95b3681d058435f577ee48c2a646720", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738132439, - "narHash": "sha256-7q5vsyPQf6/aQEKAOgZ4ggv++Z2ppPSuPCGKlbPcM88=", + "lastModified": 1738477724, + "narHash": "sha256-S1x0F7q9cJ6EEmZsakse2Ps6Adi7NadxRtGiuWUlwT0=", "owner": "nix-community", "repo": "fenix", - "rev": "f94e521c1922784c377a2cace90aa89a6b8a1011", + "rev": "1936bb37b1d8597273e3611873dc09dd61b09818", "type": "github" }, "original": { @@ -226,11 +226,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1738197605, - "narHash": "sha256-yiLnWStN5yi/BuZDKBwkxNrtejD51h5eB1eC8jAauiw=", + "lastModified": 1738448366, + "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "owner": "nix-community", "repo": "home-manager", - "rev": "7636b248675e00d887ec0e6932c316d87f36dbf3", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "type": "github" }, "original": { @@ -245,11 +245,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1737617533, - "narHash": "sha256-9hHaUxeRDZ5PTk7TqBbHPAjgKuBl67asaMdyehYLqFs=", + "lastModified": 1738478597, + "narHash": "sha256-it7lc+HRSQiLV+3CcA+c6fkr2355HyT2GGUowHdfa/E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2dd65c3c92a4b8b1bf653657ae8648b883a4d427", + "rev": "77fb0818cb42ca0db98839d47bbc6a317c286282", "type": "github" }, "original": { @@ -3343,11 +3343,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738082745, - "narHash": "sha256-wuHCbF+e608ly6jwqtRK0kQOrGPNfF5HPM+k/9m3SJQ=", + "lastModified": 1738433753, + "narHash": "sha256-lyhEsEf5FQzV+KHVkfxIApMOFWHqyls5+llcQ/uhV6Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "bc10a4479821188597be042b332e2ed9b3769376", + "rev": "88b901878e684e4f68f104fdbc48749f41bcccd3", "type": "github" }, "original": { @@ -3444,16 +3444,15 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1738503390, + "lastModified": 1738663128, "narHash": "sha256-k+lXb31oXWD2Sc8/+F4Tw9IAOEvi14e3hnx/hpBSbcE=", - "owner": "amadaluzia", + "owner": "notashelf", "repo": "wallpkgs", - "rev": "bd56d6c493bc7338000842663b07362085fc1462", + "rev": "6b0d216132199fa58808fde281117c1fcd892e98", "type": "github" }, "original": { - "owner": "amadaluzia", - "ref": "docs-fixup", + "owner": "notashelf", "repo": "wallpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d2c3490..d8a480e 100644 --- a/flake.nix +++ b/flake.nix @@ -33,9 +33,8 @@ }; wallpkgs = { type = "github"; - owner = "amadaluzia"; + owner = "notashelf"; repo = "wallpkgs"; - ref = "docs-fixup"; inputs.nixpkgs.follows = "nixpkgs"; }; pankomacs = { @@ -65,16 +64,9 @@ }; }; }; - outputs = inputs @ { - self, - flake-parts, - ... - }: let - inherit ((import ./lib {inherit inputs self;}).flake) lib; - in + outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake { inherit inputs; - specialArgs = {inherit lib;}; } { systems = ["x86_64-linux"]; imports = [ diff --git a/hosts/default.nix b/hosts/default.nix index b4cf458..a8dc4c5 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,8 +1,10 @@ { inputs, - lib, + self, ... -}: { +}: let + inherit (self) lib; +in { flake = { nixosConfigurations = builtins.mapAttrs (n: v: lib.mkHost (v // {host = n;})) { python = { diff --git a/hosts/python/users/configs/niri/config.kdl b/hosts/python/users/configs/niri/config.kdl index 9ee7e47..325841b 100644 --- a/hosts/python/users/configs/niri/config.kdl +++ b/hosts/python/users/configs/niri/config.kdl @@ -232,7 +232,7 @@ animations { // off // Slow down all animations by this factor. Values below 1 speed them up instead. - slowdown 0.5 + slowdown 0.9 } // Window rules let you adjust behavior for individual windows. diff --git a/hosts/python/users/configs/qutebrowser/config.py b/hosts/python/users/configs/qutebrowser/config.py index 2723129..ce900a0 100644 --- a/hosts/python/users/configs/qutebrowser/config.py +++ b/hosts/python/users/configs/qutebrowser/config.py @@ -42,13 +42,13 @@ nord = { load_theme(c, nord) c.colors.webpage.preferred_color_scheme = "dark" -c.tabs.position = "left" +c.tabs.position = "top" c.tabs.width = 32 -c.fonts.default_size = "14pt" +c.fonts.default_size = "13pt" c.fonts.default_family = "sans-serif" c.tabs.padding = { - "bottom": 6, - "top": 6, + "bottom": 4, + "top": 4, "left": 6, "right": 6, } diff --git a/hosts/shared/niri.nix b/hosts/shared/niri.nix index bc06371..6c4b263 100644 --- a/hosts/shared/niri.nix +++ b/hosts/shared/niri.nix @@ -12,26 +12,30 @@ in { }; config = lib.mkIf cfg.enable { - alqueva.support.wayland = true; - - xdg.portal = { - enable = true; - configPackages = [cfg.package]; - extraPortals = [pkgs.xdg-desktop-portal-gnome]; - config = { - niri = { - default = [ - "gnome" - ]; - "org.freedesktop.impl.portal.Secret" = [ - "gnome-keyring" - ]; - }; - }; - }; - environment.systemPackages = [ cfg.package ]; + + xdg.portal = { + config = { + niri = { + "org.freedesktop.impl.portal.Secret" = [ + "gnome-keyring" + ]; + default = [ + "gnome" + "gtk" + ]; + }; + }; + configPackages = [cfg.package]; + extraPortals = [ + pkgs.xdg-desktop-portal-gnome + pkgs.xdg-desktop-portal-gtk + ]; + }; + + alqueva.support.wayland = true; + services.gnome.gnome-keyring.enable = true; }; } diff --git a/hosts/shared/support.nix b/hosts/shared/support.nix index 6690e62..c5fa3e5 100644 --- a/hosts/shared/support.nix +++ b/hosts/shared/support.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let cfg = config.alqueva.support; @@ -11,19 +10,14 @@ in { wayland = mkEnableOption "wayland support"; }; config = lib.mkIf cfg.wayland { - xdg.portal = lib.mkDefault { + xdg.portal = { enable = true; - config.common = { - default = ["gtk"]; - }; - extraPortals = [pkgs.xdg-desktop-portal-gtk]; + xdgOpenUsePortal = true; }; environment.sessionVariables = { "NIXOS_OZONE_WL" = "1"; "QT_QPA_PLATFORM" = "wayland"; }; - - services.gnome.gnome-keyring.enable = true; }; }