diff --git a/flake.lock b/flake.lock index 8c56741..b86bdae 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756741629, - "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=", + "lastModified": 1758270360, + "narHash": "sha256-yqh6EEhlpVWRoKl85o1s+QZ72UHWTvornnc3C0Ls484=", "owner": "catppuccin", "repo": "nix", - "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382", + "rev": "2e0aacdd6abbecd1b1c0511a2fcd1460a6bc6645", "type": "github" }, "original": { @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1756958609, - "narHash": "sha256-1nRGsnPZjOubRTsXEsnJqWlLsgo/Xq7tN7PWK57dFDQ=", + "lastModified": 1758254611, + "narHash": "sha256-5oMrmEG8A5FopmDZJ5QlskhLyf2SsdipGmKpT7n1JCE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "b2a4e1bc62946403f82594ab9550ac13a1afa4df", + "rev": "c451ce9fe2c5e0b46b221bb485a7b1e1ca8a3484", "type": "gitlab" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1756954499, - "narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=", + "lastModified": 1758288820, + "narHash": "sha256-ubyO7Ly6NSFN5GgNTEuoIavBFMZOMcRchSTIXiDVtAI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25", + "rev": "e38751933802481b37fee1f9251cbb86e63df381", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756925795, - "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ba6fab29768007e9f2657014a6e134637100c57d", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { diff --git a/homeConfigs/home.nix b/homeConfigs/home.nix index 10b9cdb..f1763b5 100644 --- a/homeConfigs/home.nix +++ b/homeConfigs/home.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/17 18:15:38 by tomoron #+# #+# # -# Updated: 2025/09/17 18:18:51 by tomoron ### ########.fr # +# Updated: 2025/09/19 19:23:28 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -86,11 +86,17 @@ home.sessionPath = [ "~/.local/bin" ]; + + programs.rofi = { + enable = true; + theme = "rounded-nord-dark"; + }; + home.file = { #should be able to make most of these in nix configs ".config/wallpaper.png".source = lib.mkDefault utils/wallpaper_test.png; ".config/pc.jpg".source = lib.mkDefault utils/pc.jpg; - ".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\""; + #".config/rofi/config.rasi".text = "@theme \"rounded-nord-dark.rasi\""; ".local/share/rofi/themes".source = "${builtins.fetchGit { url = "https://github.com/newmanls/rofi-themes-collection"; @@ -105,6 +111,7 @@ qt.style.name = "kvantum"; catppuccin.kvantum.apply = true; + catppuccin.rofi.enable = false; catppuccin = { enable = true; diff --git a/homeConfigs/modules/vim.nix b/homeConfigs/modules/vim.nix index af40dc6..50f738c 100644 --- a/homeConfigs/modules/vim.nix +++ b/homeConfigs/modules/vim.nix @@ -69,7 +69,7 @@ lua require'lspconfig'.nixd.setup{} lua require'lspconfig'.glsl_analyzer.setup{} set signcolumn=no - + nnoremap ff Telescope find_files nnoremap fg Telescope live_grep nnoremap fb Telescope buffers diff --git a/homeConfigs/modules/wayland/hyprland.nix b/homeConfigs/modules/wayland/hyprland.nix index 9a70eaf..8f83dd0 100644 --- a/homeConfigs/modules/wayland/hyprland.nix +++ b/homeConfigs/modules/wayland/hyprland.nix @@ -22,6 +22,7 @@ "$mainMod, S, togglefloating," "$mainMod, I, pin," "$mainMod, D, exec, rofi -show drun -show-icons" + "$mainMod SHIFT, D, exec, rofi -show run -show-icons" "$mainMod, M, fullscreen, 1" "$mainMod, F, fullscreen, 0" diff --git a/homeConfigs/modules/wayland/packages.nix b/homeConfigs/modules/wayland/packages.nix index 0e7f0f9..7faffdd 100644 --- a/homeConfigs/modules/wayland/packages.nix +++ b/homeConfigs/modules/wayland/packages.nix @@ -3,7 +3,6 @@ { config = lib.mkIf config.mods.hyprland.enable { home.packages = with pkgs; [ - rofi-wayland grim slurp wl-clipboard diff --git a/osConfigs/modules/powerSave.nix b/osConfigs/modules/powerSave.nix index 4c1bd78..84d1d50 100644 --- a/osConfigs/modules/powerSave.nix +++ b/osConfigs/modules/powerSave.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/09/06 00:45:04 by tomoron #+# #+# # -# Updated: 2025/09/17 18:47:27 by tomoron ### ########.fr # +# Updated: 2025/09/21 00:51:55 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -57,11 +57,10 @@ name = "powah"; runtimeInputs = with pkgs; [ tlp ]; text = '' - if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" - exit 1 - fi - tlp ac + if [[ $EUID -ne 0 ]]; then + exec sudo bash "$0" "$@" + fi + tlp ac '' + lib.concatStringsSep "\n" config.mods.powerSave.powahCommandAdditions; }) @@ -69,11 +68,10 @@ name = "tagueule"; runtimeInputs = with pkgs; [ tlp ]; text = '' - if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" - exit 1 - fi - tlp bat + if [[ $EUID -ne 0 ]]; then + exec sudo bash "$0" "$@" + fi + tlp bat '' + lib.concatStringsSep "\n" config.mods.powerSave.tagueuleCommandAdditions; }) ];