From c7a6979fb395603c1f501510f0b3e66cfe400ba2 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:47:24 +0200 Subject: [PATCH] add follows to inputs and try new hyprland version --- flake.lock | 161 ++++---------------- flake.nix | 48 ++++-- home-manager/firefox/default.nix | 2 +- home-manager/hyprland/hyprland-settings.nix | 4 +- home-manager/nixvim/autosave.nix | 2 +- home-manager/nixvim/git.nix | 2 +- home-manager/nixvim/treesitter.nix | 7 +- modules/graphical/ime.nix | 5 +- overlays.nix | 8 + 9 files changed, 87 insertions(+), 152 deletions(-) diff --git a/flake.lock b/flake.lock index 62a8876..eeeaa1b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,8 +3,12 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { @@ -230,7 +234,7 @@ "disko": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { @@ -472,20 +476,20 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -511,69 +515,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_4": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -610,7 +551,9 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs-unstable" + ], "systems": "systems_3", "xdph": "xdph" }, @@ -839,16 +782,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", - "owner": "NixOS", + "lastModified": 1722791413, + "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -899,61 +842,15 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1722791413, - "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1714912032, - "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": [ + "home-manager-unstable" + ], "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs-unstable" @@ -1017,14 +914,14 @@ "agenix": "agenix", "disko": "disko", "flake-utils": "flake-utils", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "hyprland": "hyprland", "nix-colors": "nix-colors", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nur": "nur", @@ -1063,8 +960,12 @@ "base16-vim": "base16-vim", "flake-compat": "flake-compat_4", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_4" + "home-manager": [ + "home-manager-unstable" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] }, "locked": { "lastModified": 1722946882, diff --git a/flake.nix b/flake.nix index af3f8f0..5ca5412 100644 --- a/flake.nix +++ b/flake.nix @@ -1,38 +1,60 @@ { description = "Kop's NixOS Flake"; inputs = { - # secrets management - agenix.url = "github:ryantm/agenix"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + flake-utils.url = "github:numtide/flake-utils"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + # nix user repository + nur = { url = "github:nix-community/NUR"; }; + ## stable + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager-unstable = { - url = "github:nix-community/home-manager/master"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + # secrets management + agenix = { + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; nixos-wsl = { url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-colors.url = "github:misterio77/nix-colors"; - nur = { url = "github:nix-community/NUR"; }; + ## unstable + nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; + home-manager-unstable = { + url = "github:nix-community/home-manager/master"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + # cosmic testing nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + # vim configuration with nix nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.home-manager.follows = "home-manager-unstable"; + }; + # styling + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.home-manager.follows = "home-manager-unstable"; + }; + # disk management + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.home-manager.follows = "home-manager-unstable"; + }; + hyprland = { + url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - stylix.url = "github:danth/stylix"; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; - flake-utils.url = "github:numtide/flake-utils"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; }; outputs = { self, nur, nixpkgs, nixos-hardware, nixos-wsl, nixpkgs-unstable , agenix, home-manager, home-manager-unstable, nix-colors, nixos-cosmic diff --git a/home-manager/firefox/default.nix b/home-manager/firefox/default.nix index 58cfb1a..180b8ff 100644 --- a/home-manager/firefox/default.nix +++ b/home-manager/firefox/default.nix @@ -51,7 +51,7 @@ search = { in { programs.firefox = { enable = true; - package = if pkgs.stdenv.isLinux then pkgs.firefox else pkgs.firefox-bin; + package = pkgs.firefox-beta; policies = { Extensions = { Uninstall = [ diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 4f8fa9b..713ba87 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -67,7 +67,7 @@ in { touchpad = { natural_scroll = true; }; sensitivity = if osConfig.networking.hostName == "kop-pc" then - -0.3 + -0.4 else 0; # -1.0 - 1.0, 0 means no modification. }; @@ -184,7 +184,7 @@ in { $mainMod, Print, exec, ${grim} -g "$(${slurp} -d)" /tmp/$(date +'%s_grim.png')'' '' Shift_L, Print, exec, ${grim} -g "$(${slurp} -d)" ~/Pictures/$(date +'%s_grim.png')'' - "$mainMod, SPACE, exec, ${rofi} -show combi" + "$mainMod, SPACE, exec, ${rofi} -modi drun -show drun -config ~/.config/rofi/rofidmenu.rasi" " , XF86MonBrightnessUp, exec, ${brightnessctl} s +5%" " , XF86MonBrightnessDown, exec, ${brightnessctl} s 5%-" " , XF86AudioPlay, exec, ${playerctl} play-pause" diff --git a/home-manager/nixvim/autosave.nix b/home-manager/nixvim/autosave.nix index b2d375a..d8386e1 100644 --- a/home-manager/nixvim/autosave.nix +++ b/home-manager/nixvim/autosave.nix @@ -1,6 +1,6 @@ { plugins.auto-save = { enable = true; - enableAutoSave = true; + settings.enabled = true; }; } diff --git a/home-manager/nixvim/git.nix b/home-manager/nixvim/git.nix index cf92776..4c34fa6 100644 --- a/home-manager/nixvim/git.nix +++ b/home-manager/nixvim/git.nix @@ -3,7 +3,7 @@ diffview = { enable = true; }; neogit = { enable = true; - integrations = { diffview = true; }; + settings.integrations = { diffview = true; }; }; gitsigns = { enable = true; diff --git a/home-manager/nixvim/treesitter.nix b/home-manager/nixvim/treesitter.nix index ed2ece3..1f02a45 100644 --- a/home-manager/nixvim/treesitter.nix +++ b/home-manager/nixvim/treesitter.nix @@ -3,9 +3,10 @@ treesitter = { enable = true; nixGrammars = true; - indent = true; - - settings.highlight.enable = true; + settings = { + indent.enable = true; + highlight.enable = true; + }; }; #treesitter-context.enable = true; rainbow-delimiters.enable = true; diff --git a/modules/graphical/ime.nix b/modules/graphical/ime.nix index 94a2790..8610a7f 100644 --- a/modules/graphical/ime.nix +++ b/modules/graphical/ime.nix @@ -9,7 +9,10 @@ in }; config = mkIf cfg.enable { - i18n.inputMethod.enabled = "fcitx5"; + i18n.inputMethod.type = "fcitx5"; #deprecated + ## new + #i18n.enable = true; + #i18n.inputMethod.type = "fcitx5"; i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-mozc ]; }; } diff --git a/overlays.nix b/overlays.nix index 82f9585..c133e6b 100644 --- a/overlays.nix +++ b/overlays.nix @@ -14,6 +14,14 @@ waybar = prev.waybar.overrideAttrs (oldAttrs: { mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; }); + egl-wayland = prev.egl-wayland.overrideAttrs (oldAttrs: { + src = prev.fetchFromGitHub { + owner = "Nvidia"; + repo = "egl-wayland"; + rev = "c439cd596fb7eadae69012eaba013c39b2377771"; + hash = "sha256-+J2BTxY9c1EUOwUzLxomROM2raRwVCKXE2xq0jsDgLE="; + }; + }); hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; xdg-desktop-portal-hyprland =