From e897825573088b65c20dfdec921f3e30357b798a Mon Sep 17 00:00:00 2001 From: unexplrd Date: Sun, 9 Feb 2025 14:59:16 +0200 Subject: [PATCH] add stuff --- flake.lock | 94 +++++++++++++++++++++-- flake.nix | 4 + hosts/dunamis/configuration.nix | 7 +- hosts/dunamis/stylix.nix | 24 +++--- hosts/dunamis/users/user/programs.nix | 25 ++++-- modules/nixos/desktop/common/pipewire.nix | 5 ++ 6 files changed, 133 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index a489d8d..851ddc7 100644 --- a/flake.lock +++ b/flake.lock @@ -274,6 +274,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "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" + } + }, + "flake-utils_4": { "inputs": { "systems": [ "stylix", @@ -294,6 +312,21 @@ "type": "github" } }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -556,9 +589,44 @@ "type": "github" } }, - "neve": { + "lix": { "inputs": { "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": "lix_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737237494, + "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", + "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + } + }, + "lix_2": { + "flake": false, + "locked": { + "lastModified": 1737234286, + "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", + "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + } + }, + "neve": { + "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -715,7 +783,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -741,6 +809,7 @@ "blueprint": "blueprint", "chaotic": "chaotic", "home-manager": "home-manager_2", + "lix": "lix", "neve": "neve", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", @@ -774,12 +843,12 @@ "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_3", - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -860,6 +929,21 @@ } }, "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -966,7 +1050,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1738684748, diff --git a/flake.nix b/flake.nix index 7174da0..808ae03 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,10 @@ nix-flatpak.url = "github:gmodena/nix-flatpak"; stylix.url = "github:danth/stylix"; nixvim.url = "github:nix-community/nixvim"; + lix = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; blueprint = { url = "github:numtide/blueprint"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index 54562c0..2065bcb 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -6,6 +6,7 @@ }: { imports = with inputs; [ chaotic.nixosModules.default + lix.nixosModules.default self.nixosModules.desktop self.nixosModules.system ./hardware-conf.nix @@ -19,7 +20,11 @@ plasma.enable = true; }; - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix = { + # package = pkgs.lix; + settings.experimental-features = ["nix-command" "flakes"]; + }; + system.stateVersion = "unstable"; time.timeZone = "Europe/Kyiv"; diff --git a/hosts/dunamis/stylix.nix b/hosts/dunamis/stylix.nix index 28a5d63..42f3d51 100644 --- a/hosts/dunamis/stylix.nix +++ b/hosts/dunamis/stylix.nix @@ -12,14 +12,14 @@ ]; stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/heetch.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/helios.yaml"; polarity = "dark"; cursor = { package = pkgs.bibata-cursors-translucent; name = "Bibata_Tinted"; size = 32; }; - image = ../../wallpapers/wallhaven-yxyxzg.jpg; + image = ../../wallpapers/wallhaven-zyl9qg.png; opacity.terminal = 0.9; fonts = { sizes = { @@ -47,14 +47,14 @@ }; }; }; - stylix.override = { - base08 = "e33400"; - base09 = "e39400"; - base0A = "f2ce00"; - base0B = "5ccc96"; - base0C = "00a3cc"; - base0D = "7a5ccc"; - base0E = "b3a1e6"; - base0F = "ce6f8f"; - }; + # stylix.override = { + # base08 = "e33400"; + # base09 = "e39400"; + # base0A = "f2ce00"; + # base0B = "5ccc96"; + # base0C = "00a3cc"; + # base0D = "7a5ccc"; + # base0E = "b3a1e6"; + # base0F = "ce6f8f"; + # }; } diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix index 075e9db..1717066 100644 --- a/hosts/dunamis/users/user/programs.nix +++ b/hosts/dunamis/users/user/programs.nix @@ -8,11 +8,23 @@ programs = { bat.enable = true; + btop = { + enable = true; + settings.update_ms = 200; + }; eza.enable = true; + fd.enable = true; fzf.enable = true; - btop.enable = true; - yazi.enable = true; gitui.enable = true; + git = { + enable = true; + delta.enable = true; + aliases = { + co = "checkout"; + pom = "push origin main"; + }; + }; + ripgrep.enable = true; }; terminal = { @@ -28,17 +40,14 @@ home.packages = with pkgs; [ alejandra flatpak - waycheck - vial - git - ripgrep trashy - fd - dust procs + dust tree zip + vial unzip + waycheck virt-manager ]; } diff --git a/modules/nixos/desktop/common/pipewire.nix b/modules/nixos/desktop/common/pipewire.nix index 4b32b64..ca9988b 100644 --- a/modules/nixos/desktop/common/pipewire.nix +++ b/modules/nixos/desktop/common/pipewire.nix @@ -1,4 +1,9 @@ { + config, + lib, + ... +}: { + security.rtkit.enable = lib.mkDefault config.services.pipewire.enable; services = { pulseaudio.enable = false; pipewire = {