diff --git a/flake.lock b/flake.lock index 4832a19..a2f3f10 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,94 @@ { "nodes": { + "apple-emoji": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1748462723, + "narHash": "sha256-IyzSEe62OXMydR8pk5cxxjVim7mQi+PXwD1FzxF18kE=", + "owner": "typedrat", + "repo": "apple-emoji-linux", + "rev": "419b5b4ed32b8088214823dc5b79442a505ffceb", + "type": "github" + }, + "original": { + "owner": "typedrat", + "ref": "fix-flake-on-unstable", + "repo": "apple-emoji-linux", + "type": "github" + } + }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "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": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "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" + } + }, "cidbot": { "inputs": { "cidbot": "cidbot_2", @@ -45,6 +134,37 @@ "url": "ssh://git@github.com/RobloxUSArmyCID/CIDBot" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, + "flake-compat": { + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -84,6 +204,27 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -138,6 +279,87 @@ "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": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "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": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "48.1", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -145,11 +367,32 @@ ] }, "locked": { - "lastModified": 1748830238, - "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", + "lastModified": 1749131129, + "narHash": "sha256-tJ+93i7N4QttM75bE8T09LlSU3Mv6Dfi9WaVBvlWilo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "13a45ede6c17b5e923dfc18a40a3f646436f4809", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -244,11 +487,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -274,11 +517,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1748892157, - "narHash": "sha256-fRXyKjGIpAbmeRpxDXlGuW4Ems+pnTg/h9nz+d8C4+w=", + "lastModified": 1749139393, + "narHash": "sha256-afZUDvG2Mang9aSJVv68h+QnQmrrkv9X/9K3leRejkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d5bbb50acc86af465a8d1a3a8fcfb94499ef48d7", + "rev": "3ba41fcb4a4a5e5150001b093ce872f6d34320f7", "type": "github" }, "original": { @@ -297,11 +540,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1748877332, - "narHash": "sha256-pcAqUaMtxR1l//kugWqclFXKNQKCJQz9zO61JySGP7A=", + "lastModified": 1749107808, + "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", "owner": "nix-community", "repo": "nixvim", - "rev": "65d35db5cac209cf5acd3dfd40aee98840cfc127", + "rev": "635a9e770f77a7c586c60f84b1debf054318034a", "type": "github" }, "original": { @@ -310,6 +553,32 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", + "owner": "nix-community", + "repo": "NUR", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_2", @@ -345,11 +614,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1748651104, - "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", + "lastModified": 1749033605, + "narHash": "sha256-OkrBJNnD9/Qe2tn3/21rjbiVLlRvaNMdqzfFqUkpbHo=", "owner": "NotAShelf", "repo": "nvf", - "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", + "rev": "cb4d8340a172e95069b05f8e62f1c93e9ded859b", "type": "github" }, "original": { @@ -360,6 +629,7 @@ }, "root": { "inputs": { + "apple-emoji": "apple-emoji", "cidbot": "cidbot", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", @@ -367,7 +637,8 @@ "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim", "nvf": "nvf", - "spicetify-nix": "spicetify-nix" + "spicetify-nix": "spicetify-nix", + "stylix": "stylix" } }, "rust-overlay": { @@ -413,6 +684,43 @@ "type": "github" } }, + "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-parts": "flake-parts_3", + "git-hooks": "git-hooks", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems_7", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1749053445, + "narHash": "sha256-tf4MNRwJ5ikyg4+UfGuC1+GwMBQYh4dK4sdow1MEGVk=", + "owner": "nix-community", + "repo": "stylix", + "rev": "a057acc112856352e77d42ac4685134b2213a810", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -503,6 +811,145 @@ "type": "github" } }, + "systems_7": { + "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": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", + "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" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "apple-emoji", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "yaml": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index 6cb313c..ffb1bd7 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:nix-community/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-flatpak.url = "github:gmodena/nix-flatpak"; spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; @@ -25,23 +29,30 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + apple-emoji = { + url = "github:typedrat/apple-emoji-linux/fix-flake-on-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, nixpkgs-master, + stylix, home-manager, nix-flatpak, spicetify-nix, nvf, cidbot, nixvim, + apple-emoji, ... } @ inputs: let system = "x86_64-linux"; pkgs = import nixpkgs {inherit system;}; pkgsMaster = import nixpkgs-master {inherit system;}; + pkgsAppleEmoji = apple-emoji.packages.${system}; lib = nixpkgs.lib; spicetifyPkgs = spicetify-nix.legacyPackages.${system}; @@ -74,12 +85,14 @@ specialArgs = { inherit inputs; inherit pkgsMaster; + inherit pkgsAppleEmoji; inherit systemSettings; inherit userSettings; }; modules = [ nix-flatpak.nixosModules.nix-flatpak + stylix.nixosModules.stylix ./system/configuration.nix ]; }; @@ -92,6 +105,7 @@ inherit self; inherit inputs; inherit pkgsMaster; + inherit pkgsAppleEmoji; inherit systemSettings; inherit userSettings; inherit spicetifyPkgs; @@ -101,6 +115,7 @@ cidbot.homeManagerModules.default spicetify-nix.homeManagerModules.default nixvim.homeManagerModules.nixvim + stylix.homeModules.stylix ./user/home.nix ]; }; diff --git a/system/configuration.nix b/system/configuration.nix index 9fc177e..c3c0b4c 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -27,6 +27,7 @@ in { ./swap.nix ./user.nix ./wireshark.nix + ./themes.nix ./xserver.nix # ./virtualbox.nix ./zsh.nix diff --git a/system/themes.nix b/system/themes.nix new file mode 100644 index 0000000..252bbcd --- /dev/null +++ b/system/themes.nix @@ -0,0 +1,27 @@ +{ + pkgsAppleEmoji, + config, + pkgs, + ... +}: { + stylix = { + enable = true; + autoEnable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; + fonts = { + serif = { + package = pkgs.ubuntu_font_family; + name = "Ubuntu"; + }; + sansSerif = config.stylix.fonts.serif; + monospace = { + package = pkgs.maple-mono.NF; + name = "Maple Mono NF"; + }; + emoji = { + package = pkgsAppleEmoji.apple-emoji-linux; + name = "Apple Color Emoji"; + }; + }; + }; +} diff --git a/system/user.nix b/system/user.nix index 60fc964..5121d78 100644 --- a/system/user.nix +++ b/system/user.nix @@ -7,6 +7,6 @@ isNormalUser = true; description = userSettings.fullName; extraGroups = userSettings.groups; - shell = pkgs.zsh; + shell = pkgs.nushell; }; } diff --git a/user/git.nix b/user/git.nix index eee6b63..7e27d3b 100644 --- a/user/git.nix +++ b/user/git.nix @@ -1,4 +1,4 @@ -{userSettings, ...}: { +{pkgs, userSettings, ...}: { programs.git = { enable = true; userName = userSettings.fullName; @@ -12,4 +12,5 @@ }; }; programs.gh.enable = true; + programs.gh.extensions = [pkgs.gh-copilot]; } diff --git a/user/helix.nix b/user/helix.nix index 7291679..437bbf9 100644 --- a/user/helix.nix +++ b/user/helix.nix @@ -14,7 +14,7 @@ programs.helix = { enable = true; settings = { - theme = "nord"; + # theme = "nord"; editor = { mouse = false; line-number = "relative"; diff --git a/user/home.nix b/user/home.nix index f4ebc1f..0edaf70 100644 --- a/user/home.nix +++ b/user/home.nix @@ -16,6 +16,7 @@ ./helix.nix ./misc.nix #./nvf.nix + ./nushell.nix ./qutebrowser.nix # temporary - needs importing & stuff ./spotify.nix ./themes.nix diff --git a/user/hyprland.nix b/user/hyprland.nix index a984bac..e5846a3 100644 --- a/user/hyprland.nix +++ b/user/hyprland.nix @@ -5,10 +5,10 @@ ... }: let backgrounds = pkgs.fetchFromGitHub { - owner = "folospior"; - repo = "nord-background"; - rev = "c24b061f04bf8fc2079db9b63b5f370e67825da2"; - hash = "sha256-ZkcOEaI9AaM/qMc9UBM29kKlUDsNXl5MFTxJmu4ATCA="; + owner = "rose-pine"; + repo = "wallpapers"; + rev = "f76fd68629516ce820fe6dbcf31b5c44de78e4ad"; + hash = "sha256-swOQAoGYa82G0r93SjY2K0k9KdtP5pBBa8ROAHC03/A="; }; bgScript = pkgs.writeShellScriptBin "backgrounds" '' @@ -17,7 +17,7 @@ # waits for hyprpaper to initialize sleep 0.5s - wallpaper=$(shuf -e -n1 ${backgrounds}/*) + wallpaper=$(shuf -e -n1 ${backgrounds}/{blockwavemoon.png,leafy.png,moon.jpg,rose_pine_contourline.png,rose_pine_maze.png,rose_pine_noiseline.png,rose_pine_shape.png,something-beautiful-in-nature.png}) loaded_output=$(${pkgs.hyprland}/bin/hyprctl hyprpaper listloaded) echo $wallpaper > $HOME/wallpaper.txt if [[ $loaded_output != "no wallpapers loaded" ]]; then @@ -62,8 +62,8 @@ in { }; general = { - "col.inactive_border" = "rgb(3b4252) rgb(2e3440) 45deg"; - "col.active_border" = "rgb(4c566a) rgb(434c5e) 45deg"; + # "col.inactive_border" = "rgb(3b4252) rgb(2e3440) 45deg"; + # "col.active_border" = "rgb(4c566a) rgb(434c5e) 45deg"; gaps_out = 20; border_size = 2; }; diff --git a/user/kitty.nix b/user/kitty.nix index 5d61643..e52bf66 100644 --- a/user/kitty.nix +++ b/user/kitty.nix @@ -1,11 +1,11 @@ {pkgs, ...}: { programs.kitty = { enable = true; - themeFile = "Nord"; - font = { - name = "FantasqueSansM Nerd Font"; - package = pkgs.nerd-fonts.fantasque-sans-mono; - }; + # themeFile = "Nord"; + # font = { + # name = "FantasqueSansM Nerd Font"; + # package = pkgs.nerd-fonts.fantasque-sans-mono; + # }; settings = { # TODO: Add on-click events scrollback_lines = 10000; @@ -17,7 +17,7 @@ cursor_shape = "block"; cursor_blink_interval = "cubic-bezier(0.7, 0, 0.84, 0)"; cursor_trail = 1; - background_opacity = 0.8; + # background_opacity = 0.8; }; shellIntegration = { mode = "no-cursor"; diff --git a/user/nushell.nix b/user/nushell.nix new file mode 100644 index 0000000..3910da2 --- /dev/null +++ b/user/nushell.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: { + programs.nushell = { + enable = true; + configFile.text = '' + #!/usr/bin/env nu + $env.config.buffer_editor = "${pkgs.helix}/bin/hx" + $env.config.show_banner = false + ''; + }; + programs.starship = { + enable = true; + enableNushellIntegration = true; + }; +} diff --git a/user/rofi.nix b/user/rofi.nix index cd4e6da..5cf9e8c 100644 --- a/user/rofi.nix +++ b/user/rofi.nix @@ -132,8 +132,8 @@ programs.rofi = { enable = true; package = pkgs.rofi-wayland; - font = "JetBrains Mono 14"; - theme = "~/.config/rofi/nord.rasi"; + # font = "JetBrains Mono 14"; + #theme = "~/.config/rofi/nord.rasi"; plugins = [ pkgs.rofi-emoji-wayland ]; }; } diff --git a/user/spotify.nix b/user/spotify.nix index 1520f52..638dee8 100644 --- a/user/spotify.nix +++ b/user/spotify.nix @@ -4,7 +4,7 @@ enabledExtensions = with spicetifyPkgs.extensions; [ adblock ]; - theme = spicetifyPkgs.themes.sleek; - colorScheme = "Nord"; + # theme = spicetifyPkgs.themes.sleek; + # colorScheme = "Nord"; }; } diff --git a/user/themes.nix b/user/themes.nix index 8d5af15..6fee6dc 100644 --- a/user/themes.nix +++ b/user/themes.nix @@ -1,17 +1,33 @@ -{pkgs, ...}: { +{config, pkgs, pkgsAppleEmoji, ...}: { gtk = { enable = true; - theme = { - package = pkgs.nordic; - name = "Nordic"; - }; - font.name = "Ubuntu"; + # font.name = "Ubuntu"; iconTheme = { package = pkgs.papirus-nord; name = "Papirus-Dark"; }; }; + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; + fonts = { + serif = { + package = pkgs.ubuntu_font_family; + name = "Ubuntu"; + }; + sansSerif = config.stylix.fonts.serif; + monospace = { + package = pkgs.maple-mono.NF; + name = "Maple Mono NF"; + }; + emoji = { + package = pkgsAppleEmoji.apple-emoji-linux; + name = "Apple Color Emoji"; + }; + }; + }; + qt = { enable = true; platformTheme.name = "gtk"; diff --git a/user/vscode.nix b/user/vscode.nix index af5425b..f2ad6ff 100644 --- a/user/vscode.nix +++ b/user/vscode.nix @@ -16,7 +16,6 @@ in { programs.vscode = { enable = true; extensions = with pkgs.vscode-extensions; [ - arcticicestudio.nord-visual-studio-code gleam.gleam golang.go jnoortheen.nix-ide @@ -26,6 +25,8 @@ in { ms-vscode.cmake-tools ms-vscode.cpptools rust-lang.rust-analyzer # i dont even write rust why is this here + github.copilot + github.copilot-chat ] ++ [discord-vscode]; userSettings = { "nix.serverPath" = "nixd"; @@ -52,16 +53,9 @@ in { "editor.formatOnSave" = true; "files.autoSave" = "afterDelay"; - "workbench.colorTheme" = "Nord"; "editor.cursorStyle" = "underline"; "editor.cursorBlinking" = "smooth"; - "editor.fontFamily" = "JetBrains Mono"; - "editor.fontLigatures" = true; - "editor.fontSize" = 15; "window.titleBarStyle" = "custom"; - "terminal.integrated.fontFamily" = "JetBrainsMono Nerd Font"; - "terminal.integrated.cursorStyle" = "underline"; - "terminal.integrated.cursorBlinking" = true; "git.autofetch" = true; "git.confirmSync" = false; "git.enableSmartCommit" = true; diff --git a/user/waybar.nix b/user/waybar.nix index 93554d0..0d07533 100644 --- a/user/waybar.nix +++ b/user/waybar.nix @@ -71,6 +71,6 @@ enable = true; target = "wayland-session@Hyprland.target"; }; - style = builtins.readFile ./waybar.css; + # style = builtins.readFile ./waybar.css; }; } diff --git a/user/zed.nix b/user/zed.nix index a1916a4..a2585e2 100644 --- a/user/zed.nix +++ b/user/zed.nix @@ -17,9 +17,9 @@ userSettings = { vim_mode = true; autosave.after_delay.milliseconds = 1000; - buffer_font_family = "JetBrains Mono"; - buffer_font_size = 16; - ui_font_family = "Ubuntu"; + # buffer_font_family = "JetBrains Mono"; + # buffer_font_size = 16; + # ui_font_family = "Ubuntu"; load_direnv = "shell_hook"; tabs = { file_icons = true; @@ -52,11 +52,11 @@ }; }; - theme = { - mode = "dark"; - dark = "Nord"; - light = "One Light"; - }; + # theme = { + # mode = "dark"; + # dark = "Nord"; + # light = "One Light"; + # }; }; }; }