diff --git a/flake.lock b/flake.lock index 454da7a..30de9c3 100644 --- a/flake.lock +++ b/flake.lock @@ -390,7 +390,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -408,7 +408,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -609,17 +609,17 @@ ] }, "locked": { - "lastModified": 1724620988, - "narHash": "sha256-3CN9ZioI5XBtp6WF61hH2EyASHUIPJQCTXiW1rt9n5w=", + "lastModified": 1723370302, + "narHash": "sha256-VfRXTNBtovKcKI8/VkynjF3IeelFoGXfqFnUJyCv2hs=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "427690aec574fec75f5b7b800ac4a0b4c8e4b1d5", + "rev": "0bb3b822053c813ab6f695c9194089ccb5186cc3", "type": "github" }, "original": { "owner": "horriblename", "repo": "hyprgrass", - "rev": "427690aec574fec75f5b7b800ac4a0b4c8e4b1d5", + "rev": "0bb3b822053c813ab6f695c9194089ccb5186cc3", "type": "github" } }, @@ -637,17 +637,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1725814101, - "narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=", - "ref": "refs/heads/main", - "rev": "0f594732b063a90d44df8c5d402d658f27471dfe", - "revCount": 5196, + "lastModified": 1725208645, + "narHash": "sha256-Rv6Uskm5ToMzHX/+194pYYVexfEvz8WiIjfjGoPySu8=", + "rev": "7a24e564f43d4c24abf2ec4e5351007df2f8926c", + "revCount": 5176, "submodules": true, "type": "git", "url": "https://code.hyprland.org/hyprwm/Hyprland.git" }, "original": { - "rev": "0f594732b063a90d44df8c5d402d658f27471dfe", + "rev": "7a24e564f43d4c24abf2ec4e5351007df2f8926c", "submodules": true, "type": "git", "url": "https://code.hyprland.org/hyprwm/Hyprland.git" @@ -881,6 +880,27 @@ "type": "indirect" } }, + "kwin-effects-forceblur": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1723568262, + "narHash": "sha256-CvJmxLjxNi4VxGV4YSoAQCQPFCFBjejWx+EuX94BBps=", + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "rev": "4500adb340b7f9a28e2e7e1b47d13d58e3ffefac", + "type": "github" + }, + "original": { + "owner": "taj-ny", + "repo": "kwin-effects-forceblur", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -1453,6 +1473,29 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager-unstable" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725914634, + "narHash": "sha256-U74hu15xSb6JNySMOwyJrsh4uk1DVa182bdHLeHdYMc=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "60becd0e994e25b372c8d0500fc944396f6c1085", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "revealjs": { "flake": false, "locked": { @@ -1482,6 +1525,7 @@ "hyprland-plugins": "hyprland-plugins", "hyprlock": "hyprlock", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", + "kwin-effects-forceblur": "kwin-effects-forceblur", "lix-module": "lix-module", "magit-file-icons": "magit-file-icons", "mini-frame": "mini-frame", @@ -1500,6 +1544,7 @@ "org-xournalpp": "org-xournalpp", "org-yaap": "org-yaap", "phscroll": "phscroll", + "plasma-manager": "plasma-manager", "rust-overlay": "rust-overlay", "stylix": "stylix" } @@ -1584,7 +1629,7 @@ "gnome-shell": "gnome-shell", "home-manager": "home-manager", "nixpkgs": "nixpkgs_3", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1726170940, @@ -1675,6 +1720,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "ts-fold": { "flake": false, "locked": { @@ -1691,6 +1751,24 @@ "type": "github" } }, + "utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ws-butler": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 9185d04..1ecda3f 100644 --- a/flake.nix +++ b/flake.nix @@ -231,7 +231,7 @@ type = "git"; url = "https://code.hyprland.org/hyprwm/Hyprland.git"; submodules = true; - rev = "0f594732b063a90d44df8c5d402d658f27471dfe"; #v0.42.0+ + rev = "7a24e564f43d4c24abf2ec4e5351007df2f8926c"; #v0.42.0+ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland-plugins = { @@ -246,9 +246,20 @@ rev = "73b0fc26c0e2f6f82f9d9f5b02e660a958902763"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprgrass.url = "github:horriblename/hyprgrass/427690aec574fec75f5b7b800ac4a0b4c8e4b1d5"; + hyprgrass.url = "github:horriblename/hyprgrass/0bb3b822053c813ab6f695c9194089ccb5186cc3"; hyprgrass.inputs.hyprland.follows = "hyprland"; + plasma-manager.url = "github:pjones/plasma-manager"; + plasma-manager.inputs.nixpkgs.follows = "nixpkgs"; + plasma-manager.inputs.home-manager.follows = "home-manager-unstable"; + + kwin-effects-forceblur.url = "github:taj-ny/kwin-effects-forceblur"; + kwin-effects-forceblur.inputs.nixpkgs.follows = "nixpkgs"; + + # FIXME emacsng doesn't build or dumps core + #emacsng.url = "github:emacs-ng/emacs-ng/58fcf8c"; + #emacsng.inputs.nixpkgs.follows = "nixpkgs"; + nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; diff --git a/system/security/doas.nix b/system/security/doas.nix index f3ab361..6dfadec 100644 --- a/system/security/doas.nix +++ b/system/security/doas.nix @@ -4,18 +4,11 @@ # Doas instead of sudo security.doas.enable = true; security.sudo.enable = false; - security.doas.extraRules = [ - { - users = [ "${userSettings.username}" ]; - keepEnv = true; - persist = true; - } - { - users = [ "${userSettings.username}" ]; - cmd = "tee"; - noPass = true; - } - ]; + security.doas.extraRules = [{ + users = [ "${userSettings.username}" ]; + keepEnv = true; + persist = true; + }]; environment.systemPackages = [ (pkgs.writeScriptBin "sudo" ''exec doas "$@"'') diff --git a/user/app/nvim/init.lua b/user/app/nvim/init.lua index 79fa3c7..1c842e2 100644 --- a/user/app/nvim/init.lua +++ b/user/app/nvim/init.lua @@ -15,8 +15,6 @@ if vim.g.neovide then vim.g.neovide_cursor_vfx_mode = "pixiedust" end -vim.api.nvim_create_user_command('W', 'execute "silent! write !sudo tee % >/dev/null" edit', { nargs = 0}) - vim.g.neovide_scale_factor = 1.0 -- bootstrap lazy and all plugins