From 0808c2b3b81a554d1330c4f1d1167c5437b3be90 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sat, 28 Dec 2024 00:25:51 +0100 Subject: [PATCH] Installed startship, themed kitty, moved some configs to shell.nix, stylix for theming --- .gitignore | 2 +- catppuccin.png | Bin 0 -> 29552 bytes configuration.nix | 22 ++-- flake.lock | 271 ++++++++++++++++++++++++++++++++++++++++++- flake.nix | 4 +- home.nix | 4 +- terminal/default.nix | 7 ++ terminal/mocha.toml | 27 +++++ terminal/shell.nix | 59 ++++++++++ 9 files changed, 378 insertions(+), 18 deletions(-) create mode 100644 catppuccin.png create mode 100644 terminal/default.nix create mode 100644 terminal/mocha.toml create mode 100644 terminal/shell.nix diff --git a/.gitignore b/.gitignore index 8b13789..b2be92b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ - +result diff --git a/catppuccin.png b/catppuccin.png new file mode 100644 index 0000000000000000000000000000000000000000..a04ef22e2fd8e63746b5240de638bb2eec81b7c2 GIT binary patch literal 29552 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 literal 0 HcmV?d00001 diff --git a/configuration.nix b/configuration.nix index f689cf2..d4180b8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,6 +11,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./terminal ]; # Bootloader. @@ -70,7 +71,6 @@ # $ nix search wget environment.systemPackages = with pkgs; [ gnupg - firefox wget git kitty @@ -103,6 +103,7 @@ fastfetch freetube nixd + nextcloud-client ]; nix = { @@ -117,23 +118,11 @@ # programs.mtr.enable = true; programs = { - bash = { - # Starts the OS using Bash, then starts fish if it's not running - interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; - }; dconf = { enable = true; }; - fish.enable = true; - gnupg.agent.enable = true; hyprland = { @@ -202,6 +191,13 @@ }; }; +stylix = { + enable = true; + image = ./catppuccin.png; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + polarity = "dark"; + }; + virtualisation.docker = { enable = true; storageDriver = "btrfs"; diff --git a/flake.lock b/flake.lock index 2a198e7..6a54fd2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,71 @@ { "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": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -35,6 +101,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_2": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -74,6 +156,43 @@ "type": "github" } }, + "flake-utils_2": { + "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": [ @@ -126,6 +245,23 @@ "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": [ @@ -167,6 +303,27 @@ "type": "github" } }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -232,6 +389,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -287,7 +460,38 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixvim": "nixvim" + "nixvim": "nixvim", + "stylix": "stylix" + } + }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_3", + "nixpkgs": "nixpkgs_2", + "systems": "systems_2", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1735253599, + "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=", + "owner": "danth", + "repo": "stylix", + "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" } }, "systems": { @@ -305,6 +509,71 @@ "type": "github" } }, + "systems_2": { + "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": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9db060f..7ce5387 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,11 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix.url = "github:danth/stylix"; }; outputs = - inputs@{ nixpkgs, home-manager, ... }: + inputs@{ nixpkgs, home-manager, stylix, ... }: let system = "x86_64-linux"; in @@ -33,6 +34,7 @@ home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.martin = import ./home.nix; } + stylix.nixosModules.stylix ]; }; }; diff --git a/home.nix b/home.nix index fc51522..ba00a35 100644 --- a/home.nix +++ b/home.nix @@ -51,8 +51,8 @@ conform-nvim = { enable = true; - # TODO use nix fmt on save - settings = {}; + # TODO use nix fmt on save + settings = { }; }; lsp = { diff --git a/terminal/default.nix b/terminal/default.nix new file mode 100644 index 0000000..5404bc1 --- /dev/null +++ b/terminal/default.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + imports = [ + ./shell.nix + ]; +} diff --git a/terminal/mocha.toml b/terminal/mocha.toml new file mode 100644 index 0000000..511149f --- /dev/null +++ b/terminal/mocha.toml @@ -0,0 +1,27 @@ +[palettes.catppuccin_mocha] +rosewater = "#f5e0dc" +flamingo = "#f2cdcd" +pink = "#f5c2e7" +mauve = "#cba6f7" +red = "#f38ba8" +maroon = "#eba0ac" +peach = "#fab387" +yellow = "#f9e2af" +green = "#a6e3a1" +teal = "#94e2d5" +sky = "#89dceb" +sapphire = "#74c7ec" +blue = "#89b4fa" +lavender = "#b4befe" +text = "#cdd6f4" +subtext1 = "#bac2de" +subtext0 = "#a6adc8" +overlay2 = "#9399b2" +overlay1 = "#7f849c" +overlay0 = "#6c7086" +surface2 = "#585b70" +surface1 = "#45475a" +surface0 = "#313244" +base = "#1e1e2e" +mantle = "#181825" +crust = "#11111b" diff --git a/terminal/shell.nix b/terminal/shell.nix new file mode 100644 index 0000000..1505738 --- /dev/null +++ b/terminal/shell.nix @@ -0,0 +1,59 @@ +{ pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + starship + ]; + + programs = { + bash = { + # Starts the OS using Bash, then starts fish if it's not running + interactiveShellInit = '' + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + ''; + }; + + fish.enable = true; + + starship = { + enable = true; + settings = { + palette = "catppuccin-mocha"; + palettes = { + catppuccin-mocha = { + rosewater = "#f5e0dc"; + flamingo = "#f2cdcd"; + pink = "#f5c2e7"; + mauve = "#f5c2e7"; + red = "#f38ba8"; + maroon = "#eba0ac"; + peach = "#fab387"; + yellow = "#f9e2af"; + green = "#a6e3a1"; + teal = "#94e2d5"; + sky = "#89dceb"; + sapphire = "#89dceb"; + blue = "#89dceb"; + lavender = "#b4befe"; + text = "#cdd6f4"; + subtext1 = "#cdd6f4"; + subtext0 = "#a6adc8"; + overlay2 = "#9399b2"; + overlay1 = "#7f849c"; + overlay0 = "#6c7086"; + surface2 = "#585b70"; + surface1 = "#45475a"; + surface0 = "#313244"; + base = "#1e1e2e"; + mantle = "#181825"; + crust = "#11111b"; + }; + }; + }; + }; + }; +}