diff --git a/flake.lock b/flake.lock index 401cc8b..40c584d 100755 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,206 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + } + }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1736899990, + "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": [ + "stylix", + "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": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "47.2", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,11 +208,32 @@ ] }, "locked": { - "lastModified": 1738378034, - "narHash": "sha256-mldSa2NhDlnjqeSSFTNnkXIDrCLltpJfhrHUMBBKEiY=", + "lastModified": 1738428726, + "narHash": "sha256-OUoEgorFHBVnqQ2lITqs6MGN7MH4t/8hLEO29OKu6CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "801ddd8693481866c2cfb1efd44ddbae778ea572", + "rev": "dae6d3460c8bab3ac9f38a86affe45b32818e764", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -39,7 +261,124 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "stylix": "stylix" + } + }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "git-hooks": "git-hooks", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1738278499, + "narHash": "sha256-q1SUyXSQ9znHTME53/vPLe+Ga3V1wW3X3gWfa8JsBUM=", + "owner": "danth", + "repo": "stylix", + "rev": "b00c9f46ae6c27074d24d2db390f0ac5ebcc329f", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "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" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1735737224, + "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 507db54..5229b3d 100755 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,11 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -55,6 +60,7 @@ inherit system; specialArgs = { inherit inputs; }; modules = [ + inputs.stylix.nixosModules.stylix ./system/default.nix ]; }; diff --git a/forest.png b/forest.png new file mode 100644 index 0000000..e92b3eb Binary files /dev/null and b/forest.png differ diff --git a/home/dconf.nix b/home/dconf.nix index 603ba79..c9c580d 100644 --- a/home/dconf.nix +++ b/home/dconf.nix @@ -1,8 +1,6 @@ { inputs, pkgs, lib, config, ... }: { - services.udev.packages = [ pkgs.gnome-settings-daemon ]; - dconf = { enable = true; settings = { @@ -22,9 +20,9 @@ pkgs.gnomeExtensions.undecorate.extensionUuid pkgs.gnomeExtensions.pastafarian-holy-days.extensionUuid pkgs.gnomeExtensions.just-perfection.extensionUuid - ]; }; + "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; }; diff --git a/home/default.nix b/home/default.nix index 4ec8c4f..c52a008 100755 --- a/home/default.nix +++ b/home/default.nix @@ -16,4 +16,4 @@ ./kitty.nix ./neovim.nix ]; -} +} \ No newline at end of file diff --git a/home/gtk.nix b/home/gtk.nix index c54851e..8f8c941 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,21 +1,28 @@ { inputs, pkgs, lib, config, ... }: { - home.sessionVariables.GTK_THEME = "Tokyonight-Dark-B"; + #home.sessionVariables.GTK_THEME = "Tokyonight-Dark-B"; gtk = { enable = true; - # theme.name = "adw-gtk3"; theme = { name = "Tokyonight-Dark-B"; package = pkgs.tokyo-night-gtk; }; + cursorTheme = { - name = "Oreo-Cursors"; - package = pkgs.oreo-cursors-plus; + name = "Vimix-Cursors"; + package = pkgs.vimix-cursor-theme; }; + iconTheme = { name = "breeze-dark"; package = pkgs.breeze-icons; }; }; + # home.sessionVariables = { + # GTK_THEME = "Tokyonight-Dark-B"; + # XCURSOR_THEME = "vimix-cursor-theme"; + # XDG_CURRENT_DESKTOP = "GNOME"; + # GTK_ICON_THEME = "breeze-dark"; + # }; } \ No newline at end of file diff --git a/system/bg-beach.png b/system/bg-beach.png new file mode 100755 index 0000000..e8d60e2 Binary files /dev/null and b/system/bg-beach.png differ diff --git a/system/default.nix b/system/default.nix index 13e80dd..0e9a2e7 100755 --- a/system/default.nix +++ b/system/default.nix @@ -4,6 +4,7 @@ imports = [ ./configuration.nix + # ./stylix.nix ./gnome.nix ./yazi.nix ./nvidia.nix diff --git a/system/forest.png b/system/forest.png new file mode 100644 index 0000000..e92b3eb Binary files /dev/null and b/system/forest.png differ diff --git a/system/gnome.nix b/system/gnome.nix index ce7429f..717c1c3 100755 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -18,8 +18,8 @@ pastafarian-holy-days just-perfection ]) ++ (with pkgs; [ - gnome-tweaks - adwaita-icon-theme + # gnome-tweaks + # adwaita-icon-theme ]); } diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index c64512a..6c49ba1 100755 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -25,7 +25,7 @@ }; swapDevices = [{ - device = "/dev/nvme0n1p7"; + device = "/dev/disk/by-uuid/e2e8a734-702b-43a7-b645-cf239309b070"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/system/packages.nix b/system/packages.nix index 4bdf342..a9c52ea 100755 --- a/system/packages.nix +++ b/system/packages.nix @@ -25,6 +25,7 @@ yazi ]; + programs.thunderbird.enable = true; # Install firefox. programs.noisetorch.enable = true; diff --git a/system/stylix.nix b/system/stylix.nix new file mode 100644 index 0000000..b88ef16 --- /dev/null +++ b/system/stylix.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + stylix = { + enable = true; + image = ./forest.png; + polarity = "dark"; + }; +} diff --git a/system/vscode.nix b/system/vscode.nix index 14f70ad..b0636c3 100755 --- a/system/vscode.nix +++ b/system/vscode.nix @@ -16,6 +16,7 @@ vscodevim.vim enkia.tokyo-night yzhang.markdown-all-in-one + vscode-icons-team.vscode-icons ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "remote-ssh-edit";