From 14b48c3119bbec09b0458f7f36b82d99ca22bc74 Mon Sep 17 00:00:00 2001 From: maxstrb Date: Sun, 21 Sep 2025 20:04:41 +0200 Subject: [PATCH] before school --- configuration/main/configuration.nix | 13 +-- flake.lock | 138 +++++++++++++-------------- flake.nix | 32 ------- flakes/flake.lock | 100 ++----------------- flakes/flake.nix | 6 +- home/main/home.nix | 18 ++-- home/modules/hyprland.nix | 35 ++++--- home/modules/multimedia.nix | 2 +- home/modules/nvf.nix | 7 ++ home/modules/programming.nix | 1 + home/modules/rice.nix | 11 ++- home/modules/shells.nix | 6 ++ home/modules/stylix.nix | 9 +- 13 files changed, 150 insertions(+), 228 deletions(-) diff --git a/configuration/main/configuration.nix b/configuration/main/configuration.nix index ecc17f2..d972057 100644 --- a/configuration/main/configuration.nix +++ b/configuration/main/configuration.nix @@ -63,9 +63,9 @@ nix-ld = { enable = true; - libraries = with pkgs; [ - # Add libraries here - ]; + #libraries = with pkgs; [ + # Add libraries here + #]; }; }; @@ -75,8 +75,8 @@ efi.canTouchEfiVariables = true; }; - #kernelPackages = pkgs.linuxPackages_latest; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.linuxPackages_latest; + #kernelPackages = pkgs.linuxPackages_zen; }; networking = { @@ -123,6 +123,7 @@ tumbler.enable = true; printing.enable = true; + avahi.enable = true; displayManager.sddm = { enable = true; @@ -152,7 +153,7 @@ users.users.maxag = { isNormalUser = true; description = "Max Ag"; - extraGroups = ["networkmanager" "wheel" "video"]; + extraGroups = ["networkmanager" "wheel" "video" "input"]; shell = pkgs.nushell; }; diff --git a/flake.lock b/flake.lock index ca85049..fd09eb4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1753216019, - "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "be166e11d86ba4186db93e10c54a141058bdce49", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1754421590, - "narHash": "sha256-TrlzGR5l/OltcTnBtihUxoKqv+JNEKWmUamDVWICtX0=", + "lastModified": 1757997814, + "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0b1afdb5efbf59f4b6e934d090cf8d150517890", + "rev": "5820376beb804de9acf07debaaff1ac84728b708", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1752149140, - "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", + "lastModified": 1757542864, + "narHash": "sha256-8i9tsVoOmLQDHJkNgzJWnmxYFGkJNsSndimYpCoqmoA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", + "rev": "aa9d14963b94186934fd0715d9a7f0f2719e64bb", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1754415092, - "narHash": "sha256-VkdVe6J2lgvTev9P1/Ybi2znXOZr8x7NjGS2yr4I+6Y=", + "lastModified": 1757977770, + "narHash": "sha256-opWeyLdiAoI4OfEatTnijIu8JBcdAwFdd6MW2pErK4c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3c6536d9328280b1811a2dbcc4596c1cafb80abd", + "rev": "5e96fac52fbd353eaf51ac436d1ada16a021e5f2", "type": "github" }, "original": { @@ -434,11 +434,11 @@ ] }, "locked": { - "lastModified": 1753819801, - "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "lastModified": 1757508108, + "narHash": "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "rev": "119bcb9aa742658107b326c50dcd24ab59b309b7", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1753800567, - "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -513,11 +513,11 @@ ] }, "locked": { - "lastModified": 1751897909, - "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "mnw": { "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -569,11 +569,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754388740, - "narHash": "sha256-6++6FDc/hcMpaJPgOrGzwmzCSgix3zIlcuTIy9+aNSs=", + "lastModified": 1757955071, + "narHash": "sha256-owSpkt551cIqDDk5iHesdEus9REFeOIY3rY4C5ZPm/Y=", "owner": "notashelf", "repo": "nvf", - "rev": "22fb0d22cc474e85f94c5aa95b6c550c81ca7278", + "rev": "1bd9fc116420db4c1156819d61df5d5312e1bbea", "type": "github" }, "original": { @@ -616,11 +616,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754334303, - "narHash": "sha256-jmBVvEzchjsfH0zpcDl6Ujx2lvpi/rdZ813fkmkIsZw=", + "lastModified": 1757956156, + "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", "owner": "danth", "repo": "stylix", - "rev": "665a4ede4dbc2f52575a3eeaa457a89d97d3d28e", + "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", "type": "github" }, "original": { @@ -753,11 +753,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -769,11 +769,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -785,11 +785,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -826,11 +826,11 @@ ] }, "locked": { - "lastModified": 1753633878, - "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", + "lastModified": 1755354946, + "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", + "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 65e952a..2492065 100644 --- a/flake.nix +++ b/flake.nix @@ -57,37 +57,5 @@ } ]; }; - - nixosConfigurations.server = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit inputs; - }; - - modules = [ - ./configuration/main/configuration.nix.nix - ./configuration/main/hardware-configuration.nix.nix - - inputs.home-manager.nixosModules.default - { - home-manager = { - useUserPackages = true; - useGlobalPkgs = true; - - extraSpecialArgs = {inherit inputs;}; - backupFileExtension = "backup_nix"; - - users.maxag = ./home/main/home.nix; - }; - } - - inputs.stylix.nixosModules.stylix - { - home-manager.sharedModules = [ - inputs.stylix.homeModules.stylix - ]; - } - ]; - }; }; } diff --git a/flakes/flake.lock b/flakes/flake.lock index 5df49fc..3664df1 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -1,46 +1,12 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -50,27 +16,10 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1708161998, - "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "84d981bae8b5e783b3b548de505b22880559515f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay", - "zig": "zig" + "rust-overlay": "rust-overlay" } }, "rust-overlay": { @@ -80,11 +29,11 @@ ] }, "locked": { - "lastModified": 1752979888, - "narHash": "sha256-qRRP3QavbwW0o+LOh31QNEfCgPlzK5SKlWALUJL6T7E=", + "lastModified": 1757989933, + "narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "95719de18aefa63a624bf75a1ff98744b089ec12", + "rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3", "type": "github" }, "original": { @@ -92,41 +41,6 @@ "repo": "rust-overlay", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "zig": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1754354324, - "narHash": "sha256-deZUyD+ge4ydLI4pEHVC1yMOqOObDTGPAQHIWiVpAYo=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "62ce8fa048f5b56c445f7a21ed1ad8697ff82ff5", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flakes/flake.nix b/flakes/flake.nix index c3e27f6..0823778 100644 --- a/flakes/flake.nix +++ b/flakes/flake.nix @@ -6,7 +6,7 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - zig.url = "github:mitchellh/zig-overlay"; + #zig.url = "github:mitchellh/zig-overlay"; }; outputs = {nixpkgs, ...} @ inputs: let system = "x86_64-linux"; @@ -33,8 +33,8 @@ }; zig = pkgs.mkShell { - buildInputs = [ - inputs.zig.packages.${system}.master + buildInputs = with pkgs; [ + zig ]; }; diff --git a/home/main/home.nix b/home/main/home.nix index f3230be..acf5986 100644 --- a/home/main/home.nix +++ b/home/main/home.nix @@ -8,14 +8,14 @@ programs.home-manager.enable = true; imports = [ - ./modules/hyprland.nix - ./modules/nvf.nix - ./modules/stylix.nix - ./modules/games.nix - ./modules/programming.nix - ./modules/multimedia.nix - ./modules/communication.nix - ./modules/rice.nix - ./modules/shells.nix + ../modules/hyprland.nix + ../modules/nvf.nix + ../modules/stylix.nix + ../modules/games.nix + ../modules/programming.nix + ../modules/multimedia.nix + ../modules/communication.nix + ../modules/rice.nix + ../modules/shells.nix ]; } diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 3759cfe..edd4eca 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -136,16 +136,27 @@ "$mainMod, code:19, workspace, 10" # same as above, but switch to the workspace - "$mainMod SHIFT, code:10, movetoworkspacesilent, 1" - "$mainMod SHIFT, code:11, movetoworkspacesilent, 2" - "$mainMod SHIFT, code:12, movetoworkspacesilent, 3" - "$mainMod SHIFT, code:13, movetoworkspacesilent, 4" - "$mainMod SHIFT, code:14, movetoworkspacesilent, 5" - "$mainMod SHIFT, code:15, movetoworkspacesilent, 6" - "$mainMod SHIFT, code:16, movetoworkspacesilent, 7" - "$mainMod SHIFT, code:17, movetoworkspacesilent, 8" - "$mainMod SHIFT, code:18, movetoworkspacesilent, 9" - "$mainMod SHIFT, code:19, movetoworkspacesilent, 10" + "$mainMod SHIFT, code:10, movetoworkspace, 1" + "$mainMod SHIFT, code:11, movetoworkspace, 2" + "$mainMod SHIFT, code:12, movetoworkspace, 3" + "$mainMod SHIFT, code:13, movetoworkspace, 4" + "$mainMod SHIFT, code:14, movetoworkspace, 5" + "$mainMod SHIFT, code:15, movetoworkspace, 6" + "$mainMod SHIFT, code:16, movetoworkspace, 7" + "$mainMod SHIFT, code:17, movetoworkspace, 8" + "$mainMod SHIFT, code:18, movetoworkspace, 9" + "$mainMod SHIFT, code:19, movetoworkspace, 10" + + "$mainMod ALT, code:10, movetoworkspacesilent, 1" + "$mainMod ALT, code:11, movetoworkspacesilent, 2" + "$mainMod ALT, code:12, movetoworkspacesilent, 3" + "$mainMod ALT, code:13, movetoworkspacesilent, 4" + "$mainMod ALT, code:14, movetoworkspacesilent, 5" + "$mainMod ALT, code:15, movetoworkspacesilent, 6" + "$mainMod ALT, code:16, movetoworkspacesilent, 7" + "$mainMod ALT, code:17, movetoworkspacesilent, 8" + "$mainMod ALT, code:18, movetoworkspacesilent, 9" + "$mainMod ALT, code:19, movetoworkspacesilent, 10" # window control "$mainMod SHIFT, left, movewindow, l" @@ -216,6 +227,8 @@ bar = { launcher.autoDetectIcon = true; + clock.format = "%d %b %H:%M"; + workspaces.show_numbered = true; layouts = { @@ -238,7 +251,7 @@ menus.clock = { time = { military = true; - hideSeconds = true; + hideSeconds = false; }; weather.enabled = false; }; diff --git a/home/modules/multimedia.nix b/home/modules/multimedia.nix index 7c03a02..aa97c09 100644 --- a/home/modules/multimedia.nix +++ b/home/modules/multimedia.nix @@ -3,7 +3,7 @@ packages = with pkgs; [ libreoffice xarchiver - trilium-next-desktop + trilium-desktop krita libresprite mpv diff --git a/home/modules/nvf.nix b/home/modules/nvf.nix index 26a9b6b..e782753 100644 --- a/home/modules/nvf.nix +++ b/home/modules/nvf.nix @@ -11,6 +11,13 @@ enable = true; settings.vim = { + theme = { + enable = true; + transparent = true; + + name = "catppuccin"; + style = "mocha"; + }; lsp = { enable = true; diff --git a/home/modules/programming.nix b/home/modules/programming.nix index 08030bf..c8e90a2 100644 --- a/home/modules/programming.nix +++ b/home/modules/programming.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { home.packages = with pkgs; [ godot + lazygit ]; } diff --git a/home/modules/rice.nix b/home/modules/rice.nix index b316b6f..5c63182 100644 --- a/home/modules/rice.nix +++ b/home/modules/rice.nix @@ -38,13 +38,13 @@ "os" "kernel" "cpu" - "memory" { type = "gpu"; key = "GPU"; detectionMethod = "pci"; hideType = "integrated"; } + "memory" "wm" "terminal" "shell" @@ -55,8 +55,13 @@ foot = { enable = true; - settings.main = { - term = "xterm-256color"; + settings = { + main = { + term = "xterm-256color"; + }; + #colors = { + # alpha = "0.85"; + #}; }; }; diff --git a/home/modules/shells.nix b/home/modules/shells.nix index 4b441dc..c2c4060 100644 --- a/home/modules/shells.nix +++ b/home/modules/shells.nix @@ -55,9 +55,15 @@ "rs" => { flake rust -c $"nvim ($file)" } + "zig" => { + flake zig -c $"nvim ($file)" + } "c" | "cpp" => { flake c -c $"nvim ($file)" } + "cs" => { + flake c-sharp -c $"nvim ($file)" + } _ => {nvim $file} } } diff --git a/home/modules/stylix.nix b/home/modules/stylix.nix index ab04c92..318723d 100644 --- a/home/modules/stylix.nix +++ b/home/modules/stylix.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { stylix = { enable = true; + overlays.enable = false; targets = { gtk.enable = true; @@ -28,6 +29,12 @@ base0F = "f2cdcd"; # flamingo }; + opacity.terminal = 0.75; + + targets.nvf = { + enable = false; + }; + cursor = { package = pkgs.bibata-cursors; name = "Bibata-Modern-Ice"; @@ -44,7 +51,7 @@ monospace = { package = pkgs.nerd-fonts.jetbrains-mono; - name = "JetBrainsMono Nerd Font Mono"; + name = "JetBrainsMono Nerd Font"; }; sansSerif = {