diff --git a/config/packages.nix b/config/packages.nix index 21ec528..5ef68bc 100644 --- a/config/packages.nix +++ b/config/packages.nix @@ -23,7 +23,6 @@ ]; # Configure your nixpkgs instance config = { - # Disable if you don't want unfree packages allowUnfree = true; }; }; @@ -35,18 +34,18 @@ environment.systemPackages = with pkgs; [ git wget - fzf curl curlHTTP3 - virt-manager pinentry-curses + kitty wezterm + distrobox - ]; + virt-manager - # firefox - programs.firefox.enable = true; + kde-rounded-corners + ]; # steam programs.steam.enable = true; diff --git a/flake.lock b/flake.lock index d245074..04580ba 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "attic": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", - "revCount": 197, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.197%2Brev-4dbdbee45728d8ce5788db6461aaaa89d98081f0/018e8bce-1229-7d78-a052-5121272f0341/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" - } - }, "catppuccin": { "locked": { "lastModified": 1713552048, @@ -48,189 +15,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "attic": "attic", - "compare-to": "compare-to", - "conduit": "conduit", - "crane": "crane", - "fenix": "fenix", - "flake-compat": "flake-compat", - "flake-schemas": "flake-schemas", - "flake-utils": "flake-utils", - "home-manager": "home-manager", - "jovian": "jovian", - "jujutsu": "jujutsu", - "niri": "niri", - "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs", - "systems": "systems", - "yafas": "yafas" - }, - "locked": { - "lastModified": 1713695093, - "narHash": "sha256-ByphxORPCWxBH4Tl4j13dP/HnYymcpsI8acgku+nZko=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "8cb2e4eb3422d099ce80c95accfbba917c45622d", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, - "compare-to": { - "locked": { - "lastModified": 1695341185, - "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", - "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", - "revCount": 2, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" - } - }, - "conduit": { - "inputs": { - "attic": [ - "chaotic", - "attic" - ], - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-compat": [ - "chaotic", - "flake-compat" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713379868, - "narHash": "sha256-L/QhOkRmzB/gmwrWrqxct/sD6XIL4AOGguRhb4ahO/8=", - "owner": "girlbossceo", - "repo": "conduwuit", - "rev": "d0a9666a2976b983daf72eb0c0f8d41c04443f84", - "type": "github" - }, - "original": { - "owner": "girlbossceo", - "repo": "conduwuit", - "type": "github" - } - }, - "crane": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706473297, - "narHash": "sha256-FbxuYIrHaXpsYCLtI1gCNJhd+qvERjPibXL3ctmVaCs=", - "rev": "fe812ef0dad5bb93a56c599d318be176d080281d", - "revCount": 493, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.1/018d51be-1c17-765e-babc-c9e3bc8a5a14/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1711952616, - "narHash": "sha256-WJvDdOph001fA1Ap3AyaQtz/afJAe7meSG5uJAdSE+A=", - "rev": "209048d7c545905c470f6f8c05c5061f391031a8", - "revCount": 1822, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1822%2Brev-209048d7c545905c470f6f8c05c5061f391031a8/018e98ba-d842-7dad-9d6a-0d0ee173b6b1/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz" - } - }, - "flake-schemas": { - "locked": { - "lastModified": 1693491534, - "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", - "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", - "revCount": 21, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" - } - }, - "flake-utils": { - "inputs": { - "systems": [ - "chaotic", - "systems" - ] - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "revCount": 92, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.92%2Brev-b1d9ab70662946ef0850d488da1c9019f3a9752a/018e2ca5-e5a2-7f80-9261-445a8cecd4d7/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz" - } - }, "flatpaks": { "locked": { "lastModified": 1711997375, @@ -262,27 +46,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713566308, - "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "057117a401a34259c9615ce62218aea7afdee4d3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -302,129 +65,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713606448, - "narHash": "sha256-JMKo6uoAcUip9N10a3r1T2IoLz+pUStwIFrsVW/R4MA=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "96cbbcd3712a0cb7f128c54b21ec2af0950d88d0", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "jujutsu": { - "inputs": { - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1713587469, - "narHash": "sha256-hzdBK0+RgfVGWFEOIKuAUv6P8p1k7wLIt6VBi/tX0RI=", - "owner": "martinvonz", - "repo": "jj", - "rev": "cce1b9f00a60dd3cd03b3f360bb8be2b677914bc", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "repo": "jj", - "type": "github" - } - }, - "niri": { - "inputs": { - "crane": [ - "chaotic", - "crane" - ], - "fenix": [ - "chaotic", - "fenix" - ], - "flake-utils": [ - "chaotic", - "flake-utils" - ], - "nix-filter": [ - "chaotic", - "nix-filter" - ], - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713597873, - "narHash": "sha256-eA0rS7ZjLujv6bcFokzHeOuM6VFfEnY/2Guridclny0=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "4fc80124ade72c8ff2b860b1ce4d51ba49a2be13", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-06cb-009a-fingerprint-sensor": { "inputs": { "nixpkgs": [ @@ -449,14 +89,16 @@ "locked": { "lastModified": 1713537308, "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "owner": "nixos", + "repo": "nixpkgs", "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", - "revCount": 614481, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.614481%2Brev-5c24cf2f0a12ad855f444c30b2421d044120c66f/018efa00-a443-7f41-b371-ce568b5c7e9f/source.tar.gz" + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-master": { @@ -475,38 +117,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -533,98 +143,14 @@ "root": { "inputs": { "catppuccin": "catppuccin", - "chaotic": "chaotic", "flatpaks": "flatpaks", "hardware": "hardware", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", "plasma-manager": "plasma-manager" } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1711885694, - "narHash": "sha256-dyezzeSbWMpflma+E9USmvSxuLgGcNGcGw3cOnX36ko=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "e4a405f877efd820bef9c0e77a02494e47c17512", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "chaotic", - "jujutsu", - "flake-utils" - ], - "nixpkgs": [ - "chaotic", - "jujutsu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707444620, - "narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "78503e9199010a4df714f29a4f9c00eb2ccae071", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "yafas": { - "inputs": { - "flake-schemas": [ - "chaotic", - "flake-schemas" - ], - "systems": [ - "chaotic", - "systems" - ] - }, - "locked": { - "lastModified": 1695926485, - "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", - "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", - "revCount": 4, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz" - } } }, "root": "root", diff --git a/users/ruben/desktop.nix b/users/ruben/desktop.nix new file mode 100644 index 0000000..080d168 --- /dev/null +++ b/users/ruben/desktop.nix @@ -0,0 +1,57 @@ +# ╭───────────────────────────────────────────╮ +# │ _ _ │ +# │ __ __ _| |_ _ __ _ __ _ _ __ __(_)_ _ │ +# │ / _/ _` | _| '_ \ '_ \ || / _/ _| | ' \ │ +# │ \__\__,_|\__| .__/ .__/\_,_\__\__|_|_||_| │ +# │ |_| |_| │ +# │ catppuccin │ +# ╰───────────────────────────────────────────╯ +{ + inputs, + lib, + osConfig, + config, + pkgs, + ... +}: { + programs.plasma = { + workspace = { + clickItemTo = "select"; + lookAndFeel = "Catppuccin-Mocha-Green"; + cursorTheme = "Bibata-Modern-Ice"; + iconTheme = "Papirus-Dark"; + }; + + hotkeys.commands."launch-kitty" = { + name = "Launch Kitty"; + key = "Meta+Enter"; + command = "kitty"; + }; + + shortcuts = { + plasmashell = { + "Show Activity Switcher" = "Meta+`"; + }; + + kwin = { + "Close Window" = [ "Alt+F4" "Meta+Q" ]; + "Switch to Desktop 1" = "Meta+1"; + "Switch to Desktop 2" = "Meta+2"; + "Switch to Desktop 3" = "Meta+3"; + "Switch to Desktop 4" = "Meta+4"; + "Switch to Desktop 5" = "Meta+5"; + "Window to Desktop 1" = "Meta+Ctrl+1"; + "Window to Desktop 2" = "Meta+Ctrl+2"; + "Window to Desktop 3" = "Meta+Ctrl+3"; + "Window to Desktop 4" = "Meta+Ctrl+4"; + "Window to Desktop 5" = "Meta+Ctrl+5"; + }; + }; + + configFile = { + "kwinrc"."Desktops"."Number" = { + value = 5; + }; + }; + }; +} diff --git a/users/ruben/home.nix b/users/ruben/home.nix index b32e5e5..a7c4e9d 100644 --- a/users/ruben/home.nix +++ b/users/ruben/home.nix @@ -24,9 +24,15 @@ # catppuccin home-manager flake flake-inputs.catppuccin.homeManagerModules.catppuccin + # plasma-manager + flake-inputs.plasma-manager.homeManagerModules.plasma-manager + # user packages ./packages.nix + # plasma config + ./desktop.nix + # theme config ./themes.nix ]; diff --git a/users/ruben/packages.nix b/users/ruben/packages.nix index 383beca..c3847d6 100644 --- a/users/ruben/packages.nix +++ b/users/ruben/packages.nix @@ -40,6 +40,7 @@ mpdris2 ncmpcpp + firefox thunderbird birdtray kdePackages.kdenlive @@ -112,7 +113,7 @@ userEmail = "sneexy@disroot.org"; signing.signByDefault = true; - signing.key = "A6C94D84D2DA13EE"; + signing.key = "AE181294E97E4802"; extraConfig = { commit.verbose = true;