From 5f23444535a04f82d5a1a6145f21acdb98843c32 Mon Sep 17 00:00:00 2001 From: ant Date: Tue, 3 Dec 2024 21:44:32 +0100 Subject: [PATCH] update to 24.11 --- fish.nix | 6 +++--- flake.lock | 21 +++++++++++---------- flake.nix | 4 ++-- gaming.nix | 3 ++- home.nix | 7 ++++--- hyprland.nix | 27 +++++++++++++++++---------- terminal-software.nix | 5 +++-- ui.nix | 2 +- 8 files changed, 43 insertions(+), 32 deletions(-) diff --git a/fish.nix b/fish.nix index 8be34bb..b135016 100644 --- a/fish.nix +++ b/fish.nix @@ -69,10 +69,10 @@ set -l statusb_color (set_color $bold_flag $fish_color_status) set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus) - # direnv status - if which direnv >/dev/null + # direnv status TODO fix this if condition + # if which direnv >/dev/null set -l direnv_status (direnv status | grep -q "Found RC path" && echo " direnv") - end + # end # echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) \ echo -n -s (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) \ diff --git a/flake.lock b/flake.lock index 5c16bd4..518afa6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,42 +7,43 @@ ] }, "locked": { - "lastModified": 1729414726, - "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "fe56302339bb28e3471632379d733547caec8103", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-24_05": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1733016324, + "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7d2870d..65a41fb 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Home Manager configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-24_05.url = "github:nixos/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/gaming.nix b/gaming.nix index e8459b5..143cc9a 100644 --- a/gaming.nix +++ b/gaming.nix @@ -3,8 +3,9 @@ nixpkgs.config = { allowUnfree = true; }; home.packages = if variant == "default" then with pkgs; [ lutris - mangohud prismlauncher + gamemode + mangohud heroic steam ] diff --git a/home.nix b/home.nix index b3e5030..c2db8f8 100644 --- a/home.nix +++ b/home.nix @@ -26,6 +26,7 @@ go-mtpfs xdg-utils davfs2 + sshfs ]; @@ -136,7 +137,7 @@ XDG_SESSION_TYPE = "wayland"; XDG_SESSION_DESKTOP = "Hyprland"; QT_AUTO_SCREEN_SCALE_FACTOR = "1"; - WLR_NO_HARDWARE_CURSORS = "1"; + WLR_NO_HARDWARE_CURSORS = "0"; XCURSOR_SIZE = "24"; } // (if variant == "allegro" then { TMPDIR = "/home/${username}/tmp"; } else {}); @@ -179,7 +180,7 @@ services.gnome-keyring.enable = true; - services.syncthing.enable = if variant != "allegro" then false else true; - services.kdeconnect.enable = if variant != "allegro" then false else true; + services.syncthing.enable = variant != "allegro"; + services.kdeconnect.enable = variant != "allegro"; programs.home-manager.enable = true; } diff --git a/hyprland.nix b/hyprland.nix index ee97ec3..46ddd90 100644 --- a/hyprland.nix +++ b/hyprland.nix @@ -1,11 +1,23 @@ { config, lib, pkgs, pkgs-unstable, pkgs-24_05, variant, ... }: { home.packages = with pkgs; [ - xdg-desktop-portal - xdg-desktop-portal-gtk + # xdg-desktop-portal + # xdg-desktop-portal-gtk xdg-desktop-portal-hyprland - xwayland + # xwayland ]; + # xdg.portal = { + # enable = true; + # extraPortals = [ + # pkgs.lxqt.xdg-desktop-portal-lxqt + # pkgs.xdg-desktop-portal-kde + # ]; + # config = { + # hyprland = { default = [ "lxqt,hyprland" ]; }; + # common = { default = [ "kde,gtk" ]; }; + # }; + # }; + home.sessionVariables = { NIXOS_OZONE_WL = "1"; GDK_BACKEND = "wayland,x11"; @@ -21,7 +33,7 @@ wayland.windowManager.hyprland = { enable = true; - package = if variant == "allegro" then pkgs.hyprland else pkgs-unstable.hyprland; + package = if variant == "allegro" then pkgs.hyprland else pkgs.hyprland; xwayland.enable = true; @@ -62,11 +74,6 @@ blur = { enabled = false; }; - drop_shadow = true; - shadow_range = 8; - shadow_render_power = 4; - "col.shadow_inactive" = "rgba(1a1a1a33)"; - "col.shadow" = "rgba(1a1a1aee)"; }; animations = { @@ -300,7 +307,7 @@ # --run "${pkgs.swaybg}/bin/swaybg -m fill -i $bg" ''); monitors = if (variant == "default") then '' - monitor=,highrr,auto,1,vrr,1 + monitor=,highrr,auto,1 '' else if variant == "moon" then '' monitor=,preferred,auto,1 diff --git a/terminal-software.nix b/terminal-software.nix index 849767a..c97ef66 100644 --- a/terminal-software.nix +++ b/terminal-software.nix @@ -20,6 +20,7 @@ enable = true; viAlias = true; defaultEditor = true; + package = pkgs-unstable.neovim-unwrapped; extraPackages = (with pkgs; [ nodejs_22 ocamlPackages.lsp @@ -33,8 +34,8 @@ pyright ripgrep ]) ++ (if variant != "allegro" then [ pkgs.gcc ] else [] ); - } - // lib.attrsets.optionalAttrs (variant == "allegro") { package = pkgs-unstable.neovim-unwrapped;}; + }; + # // lib.attrsets.optionalAttrs (variant == "allegro") { package = pkgs-unstable.neovim-unwrapped;}; xdg.mimeApps.defaultApplications = { "text/plain" = "nvim.desktop"; }; diff --git a/ui.nix b/ui.nix index 6213230..068d96d 100644 --- a/ui.nix +++ b/ui.nix @@ -95,7 +95,7 @@ in size = 12.0; }; - import = [ + general.import = [ alacrittyLightTheme # default to white "~/.config/alacritty/colors.toml" ];