From 31b1b9880983d14030ad3a62b0ebc1961bbcc085 Mon Sep 17 00:00:00 2001 From: maxstrb Date: Tue, 5 Aug 2025 22:07:42 +0200 Subject: [PATCH] restructuring --- configuration/{ => main}/configuration.nix | 24 +- .../{ => main}/hardware-configuration.nix | 0 configuration/{ => main}/sddm-theme.nix | 0 configuration/{ => main}/verbatim.nix | 0 flake.lock | 235 ++++-------------- flake.nix | 52 +++- flakes/flake.lock | 88 ++++++- flakes/flake.nix | 12 + home/{ => main}/home.nix | 1 - home/modules/hyprland.nix | 3 +- home/modules/multimedia.nix | 38 +-- home/modules/nvf.nix | 10 + home/modules/shells.nix | 5 +- home/modules/stylix.nix | 18 ++ home/modules/zen.nix | 7 - 15 files changed, 260 insertions(+), 233 deletions(-) rename configuration/{ => main}/configuration.nix (87%) rename configuration/{ => main}/hardware-configuration.nix (100%) rename configuration/{ => main}/sddm-theme.nix (100%) rename configuration/{ => main}/verbatim.nix (100%) rename home/{ => main}/home.nix (94%) delete mode 100644 home/modules/zen.nix diff --git a/configuration/configuration.nix b/configuration/main/configuration.nix similarity index 87% rename from configuration/configuration.nix rename to configuration/main/configuration.nix index e12846c..ecc17f2 100644 --- a/configuration/configuration.nix +++ b/configuration/main/configuration.nix @@ -11,10 +11,6 @@ nixpkgs = { config.allowUnfree = true; - - overlays = [ - inputs.dolphin-overlay.overlays.default - ]; }; environment.systemPackages = with pkgs; [ @@ -42,6 +38,14 @@ programs = { firefox.enable = true; bash.blesh.enable = true; + xfconf.enable = true; + thunar = { + enable = true; + plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman + ]; + }; hyprland = { enable = true; @@ -56,6 +60,13 @@ dedicatedServer.openFirewall = true; localNetworkGameTransfers.openFirewall = true; }; + + nix-ld = { + enable = true; + libraries = with pkgs; [ + # Add libraries here + ]; + }; }; boot = { @@ -64,7 +75,8 @@ efi.canTouchEfiVariables = true; }; - kernelPackages = pkgs.linuxPackages_latest; + #kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; }; networking = { @@ -79,6 +91,7 @@ environment.sessionVariables = { XDG_CURRENT_DESKTOP = "Hyprland"; + TERMINAL = "foot"; }; time.timeZone = "Europe/Prague"; @@ -108,6 +121,7 @@ }; }; + tumbler.enable = true; printing.enable = true; displayManager.sddm = { diff --git a/configuration/hardware-configuration.nix b/configuration/main/hardware-configuration.nix similarity index 100% rename from configuration/hardware-configuration.nix rename to configuration/main/hardware-configuration.nix diff --git a/configuration/sddm-theme.nix b/configuration/main/sddm-theme.nix similarity index 100% rename from configuration/sddm-theme.nix rename to configuration/main/sddm-theme.nix diff --git a/configuration/verbatim.nix b/configuration/main/verbatim.nix similarity index 100% rename from configuration/verbatim.nix rename to configuration/main/verbatim.nix diff --git a/flake.lock b/flake.lock index 097b54c..ca85049 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1752743471, - "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=", + "lastModified": 1753216019, + "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506", + "rev": "be166e11d86ba4186db93e10c54a141058bdce49", "type": "github" }, "original": { @@ -70,11 +70,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -100,24 +100,6 @@ "type": "github" } }, - "dolphin-overlay": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1743892246, - "narHash": "sha256-AHeavUWjnDPT/hffE5hM8RIew+mZJSSr9tUEiSvZW30=", - "owner": "rumboon", - "repo": "dolphin-overlay", - "rev": "55fec3268972876890d6081d3d76a701c37c01d7", - "type": "github" - }, - "original": { - "owner": "rumboon", - "repo": "dolphin-overlay", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -174,11 +156,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -208,27 +190,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": [ - "nvf", - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -291,32 +252,11 @@ ] }, "locked": { - "lastModified": 1753056897, - "narHash": "sha256-AVVMBFcuOXqIgmShvRv9TED3fkiZhQ0ZvlhsPoFfkNE=", + "lastModified": 1754421590, + "narHash": "sha256-TrlzGR5l/OltcTnBtihUxoKqv+JNEKWmUamDVWICtX0=", "owner": "nix-community", "repo": "home-manager", - "rev": "13a83d1b6545b7f0e8f7689bad62e7a3b1d63771", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen-browser", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "a0b1afdb5efbf59f4b6e934d090cf8d150517890", "type": "github" }, "original": { @@ -341,11 +281,11 @@ ] }, "locked": { - "lastModified": 1749155331, - "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -393,17 +333,19 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1753033360, - "narHash": "sha256-OwTaEBF/ZXl5RyVPmsCoomunVJdDzpOSFwfvwtzdNxY=", + "lastModified": 1754415092, + "narHash": "sha256-VkdVe6J2lgvTev9P1/Ybi2znXOZr8x7NjGS2yr4I+6Y=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "462729d8655a3a37ba19fe254d8ecb6677963563", + "rev": "3c6536d9328280b1811a2dbcc4596c1cafb80abd", "type": "github" }, "original": { @@ -492,11 +434,11 @@ ] }, "locked": { - "lastModified": 1750371812, - "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", "type": "github" }, "original": { @@ -521,11 +463,11 @@ ] }, "locked": { - "lastModified": 1750371198, - "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", + "lastModified": 1753622892, + "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", + "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", "type": "github" }, "original": { @@ -546,11 +488,11 @@ ] }, "locked": { - "lastModified": 1752252310, - "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=", + "lastModified": 1753800567, + "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82", + "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7", "type": "github" }, "original": { @@ -601,74 +543,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743890059, - "narHash": "sha256-QQLhHHGNtAW8qRpseb40zqZlhZUeRRUg2SGmXjfE+so=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "58a813438464b5295170efe38d8bd5f40fcc1d23", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1750215678, - "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -707,17 +586,18 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "mnw": "mnw", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_2" }, "locked": { - "lastModified": 1753013169, - "narHash": "sha256-ZhhHGYEuBiHgWjAvFcvjiNyWDz2b3WsYoW+xw92LiYs=", + "lastModified": 1754388740, + "narHash": "sha256-6++6FDc/hcMpaJPgOrGzwmzCSgix3zIlcuTIy9+aNSs=", "owner": "notashelf", "repo": "nvf", - "rev": "da1fed218b2dda294190e004da4d5bec7d43ec34", + "rev": "22fb0d22cc474e85f94c5aa95b6c550c81ca7278", "type": "github" }, "original": { @@ -751,13 +631,11 @@ }, "root": { "inputs": { - "dolphin-overlay": "dolphin-overlay", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "nvf": "nvf", - "stylix": "stylix", - "zen-browser": "zen-browser" + "stylix": "stylix" } }, "stylix": { @@ -781,11 +659,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1753055255, - "narHash": "sha256-t7jZUPQSqlNA3wdIhmZuz7CPAMXCo6CsoAGyrR++jXA=", + "lastModified": 1754334303, + "narHash": "sha256-jmBVvEzchjsfH0zpcDl6Ujx2lvpi/rdZ813fkmkIsZw=", "owner": "danth", "repo": "stylix", - "rev": "c32c82e460b9022c4c20cf51014db1665e866ffb", + "rev": "665a4ede4dbc2f52575a3eeaa457a89d97d3d28e", "type": "github" }, "original": { @@ -948,11 +826,11 @@ ] }, "locked": { - "lastModified": 1751300244, - "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", + "lastModified": 1753633878, + "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", + "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", "type": "github" }, "original": { @@ -960,25 +838,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zen-browser": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", - "type": "github" - }, - "original": { - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b7a2c91..65e952a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nvf.url = "github:notashelf/nvf"; + nvf = { + url = "github:notashelf/nvf"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; @@ -16,11 +19,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; - - dolphin-overlay.url = "github:rumboon/dolphin-overlay"; - - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = {nixpkgs, ...} @ inputs: { @@ -31,8 +33,8 @@ }; modules = [ - ./configuration/configuration.nix - ./configuration/hardware-configuration.nix + ./configuration/main/configuration.nix + ./configuration/main/hardware-configuration.nix inputs.home-manager.nixosModules.default { @@ -43,7 +45,39 @@ extraSpecialArgs = {inherit inputs;}; backupFileExtension = "backup_nix"; - users.maxag = ./home/home.nix; + users.maxag = ./home/main/home.nix; + }; + } + + inputs.stylix.nixosModules.stylix + { + home-manager.sharedModules = [ + inputs.stylix.homeModules.stylix + ]; + } + ]; + }; + + 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; }; } diff --git a/flakes/flake.lock b/flakes/flake.lock index 50d9ab6..5df49fc 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -1,5 +1,39 @@ { "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, @@ -16,10 +50,27 @@ "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" + "rust-overlay": "rust-overlay", + "zig": "zig" } }, "rust-overlay": { @@ -41,6 +92,41 @@ "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 3b28f82..c3e27f6 100644 --- a/flakes/flake.nix +++ b/flakes/flake.nix @@ -6,6 +6,7 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; + zig.url = "github:mitchellh/zig-overlay"; }; outputs = {nixpkgs, ...} @ inputs: let system = "x86_64-linux"; @@ -21,18 +22,28 @@ gnumake ]; }; + rust = pkgs.mkShell { buildInputs = with pkgs; [ gcc gnumake rust-bin.beta.latest.default + evcxr ]; }; + + zig = pkgs.mkShell { + buildInputs = [ + inputs.zig.packages.${system}.master + ]; + }; + c-sharp = pkgs.mkShell { buildInputs = with pkgs; [ dotnetCorePackages.sdk_9_0-bin ]; }; + rice = pkgs.mkShell { buildInputs = with pkgs; [ cmatrix @@ -40,6 +51,7 @@ lavat cbonsai pipes + cava ]; }; }; diff --git a/home/home.nix b/home/main/home.nix similarity index 94% rename from home/home.nix rename to home/main/home.nix index 8668fdb..f3230be 100644 --- a/home/home.nix +++ b/home/main/home.nix @@ -17,6 +17,5 @@ ./modules/communication.nix ./modules/rice.nix ./modules/shells.nix - ./modules/zen.nix ]; } diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 58db880..3759cfe 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -98,10 +98,11 @@ "$mainMod, W, togglefloating" "$mainMod, A, exec, fuzzel" "$mainMod, P, pseudo," - "$mainMod, E, exec, dolphin" + "$mainMod, E, exec, thunar" "$mainMod, C, exec, hyprpicker -a" "$mainMod, code:23, swapsplit" "$mainMod, code:66, togglesplit" + "Alt, F4, exec, hyprctl kill" # switch focus "$mainMod, left, movefocus, l" diff --git a/home/modules/multimedia.nix b/home/modules/multimedia.nix index 8485cf4..7c03a02 100644 --- a/home/modules/multimedia.nix +++ b/home/modules/multimedia.nix @@ -1,21 +1,23 @@ {pkgs, ...}: { - home.packages = with pkgs; [ - libreoffice - kdePackages.kate - kdePackages.dolphin - kdePackages.ark - trilium-next-desktop - krita - libresprite - mpv - inkscape - qimgv - wineWowPackages.staging - ytmdesktop - ]; + home = { + packages = with pkgs; [ + libreoffice + xarchiver + trilium-next-desktop + krita + libresprite + mpv + inkscape + qimgv + wineWowPackages.staging + ytmdesktop + ]; - home.file.".config/kdeglobals".text = '' - [General] - TerminalApplication=foot - ''; + file = { + ".config/kdeglobals".text = '' + [General] + TerminalApplication=foot + ''; + }; + }; } diff --git a/home/modules/nvf.nix b/home/modules/nvf.nix index c04d201..26a9b6b 100644 --- a/home/modules/nvf.nix +++ b/home/modules/nvf.nix @@ -14,6 +14,7 @@ lsp = { enable = true; + inlayHints.enable = true; formatOnSave = true; lspkind.enable = true; lspsaga.enable = false; @@ -126,4 +127,13 @@ }; }; }; + + xdg.desktopEntries.nvim-foot = { + name = "Neovim (foot)"; + comment = "Edit text files with Neovim in foot terminal"; + icon = "nvim"; + exec = "foot -e nvim %F"; + categories = ["Utility" "TextEditor" "Development"]; + mimeType = ["text/plain" "text/x-makefile" "application/x-shellscript"]; + }; } diff --git a/home/modules/shells.nix b/home/modules/shells.nix index 18154ae..4b441dc 100644 --- a/home/modules/shells.nix +++ b/home/modules/shells.nix @@ -71,9 +71,8 @@ zel = "zellij"; rebuild = "sudo nixos-rebuild switch --flake /home/maxag/.nix-config"; system = "nvim /home/maxag/.nix-config/flake.nix"; - home = "nvim /home/maxag/.nix-config/home/home.nix"; - config = "nvim /home/maxag/.nix-config/configuration/configuration.nix"; - projects = "cd /mnt/removable/Projekty"; + home = "nvim /home/maxag/.nix-config/home/main/home.nix"; + config = "nvim /home/maxag/.nix-config/configuration/main/configuration.nix"; cat = "bat -p -P"; nvim = "edit"; nix-shell = "nix-shell --run nu"; diff --git a/home/modules/stylix.nix b/home/modules/stylix.nix index 95ac105..ab04c92 100644 --- a/home/modules/stylix.nix +++ b/home/modules/stylix.nix @@ -2,6 +2,11 @@ stylix = { enable = true; + targets = { + gtk.enable = true; + qt.enable = true; + }; + #base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; base16Scheme = { @@ -57,4 +62,17 @@ image = ../../assets/shadow_dark.png; }; + + gtk = { + enable = true; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + gtk3.extraConfig = { + gtk-recent-files-enabled = 0; + gtk-recent-files-limit = 0; + gtk-recent-files-max-age = 0; + }; + }; } diff --git a/home/modules/zen.nix b/home/modules/zen.nix deleted file mode 100644 index e8172b9..0000000 --- a/home/modules/zen.nix +++ /dev/null @@ -1,7 +0,0 @@ -{inputs, ...}: { - imports = [ - inputs.zen-browser.homeModules.twilight-official - ]; - - programs.zen-browser.enable = true; -}