diff --git a/TODO b/TODO index 05a5141..489093b 100644 --- a/TODO +++ b/TODO @@ -9,45 +9,58 @@ Get Utilities: 3. Complete helix tutorial Get nixcord working -Get thunar working and configured +Get thunar working +Set a GTK theme & icon theme +Get better wallpapers +Get hyprcursor working with Bibata-Modern-Ice + + + +Overtime just install more programs that I need regularly: ie +- btop/htop/etc + + +Get a QT theme + Get waybar (or another bar) working -Bind new terminal to SUPER+Enter instead of SUPER+Q +Get a GRUB theme working -Get a better wallpapers +Get SDDM and a theme working + +Fix pipewire audio is so incredibly low (happens on laptop and PC) + + +Bind new terminal to SUPER+Enter instead of SUPER+Q Join Rio Terminal's discord and ask if they support nerdfonts or if I'm doing something wrong Figure out how to modularise my dotfiles -Configure nixcord - Change Dell loading screen (Boot Graphics Resource Table, aka BGRT) +Get GTK Bibata Cursors to be the same size as my system cursor -Get hyprcursor working with Bibata-Modern-Ice -Install and configure hyprland plugins like hyprlock - -Get a GRUB theme working Fix: your 131072x1 screen size is bogus. expect trouble Are there plugins for helix? +Search for all "TODO" items in my nix dotfiles Push nixdots to github + +Check out the Ekala Project (I joined their discord server) + Create a program that enables/disables passwordless sudo access (add to github too) - - - Have helix editor look differently depending on language (specifically don't show indent indicators when editing nix files @@ -58,7 +71,6 @@ Learn to package my own home-manager modules - Fork nixcord and fix documentation (the installation is confusing) But firstly the first code snippet is wrong... ```nix diff --git a/flake.lock b/flake.lock index adee7a7..b0bac9c 100755 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1729527199, - "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", + "lastModified": 1730968822, + "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", + "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "type": "github" }, "original": { @@ -33,27 +33,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -85,17 +64,19 @@ } }, "flake-compat_3": { + "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", "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" + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_4": { @@ -114,91 +95,6 @@ "type": "github" } }, - "flake-compat_5": { - "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": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -221,28 +117,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "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" - } - }, "grub2-themes": { "inputs": { "nixpkgs": "nixpkgs" @@ -281,27 +155,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -345,11 +198,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1730800743, - "narHash": "sha256-DmlaerjZowNAc/NCrVHKwvAMBJYPVFx4YLs0Ad2Jo5g=", + "lastModified": 1730969692, + "narHash": "sha256-4Ly9zkqnRB6qLjMeddfUyd4iRLvq+RDspBWABS8DGN4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e3882b23d09aad7f5c3a708536c87b062f3b0d8d", + "rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", "type": "github" }, "original": { @@ -424,11 +277,11 @@ ] }, "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "lastModified": 1730968903, + "narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", "type": "github" }, "original": { @@ -462,55 +315,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729544999, - "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "65c207c92befec93e22086da9456d3906a4e999c", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.5", - "repo": "ixx", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730600078, - "narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4652874d014b82cb746173ffc64f6a70044daa7e", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixcord": { "inputs": { "flake-compat": "flake-compat_2", @@ -548,11 +352,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -564,11 +368,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -626,57 +430,6 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1730792264, - "narHash": "sha256-Ue3iywjyaNOxXgw7esVSBX3bZzM2bSPubZamYsBKIG8=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "3d24cb72618738130e6af9c644c81fe42aa34ebc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730515563, - "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=", - "owner": "NuschtOS", - "repo": "search", - "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -688,11 +441,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -708,14 +461,13 @@ "hyprland": "hyprland", "nixcord": "nixcord", "nixpkgs": "nixpkgs_4", - "nixvim": "nixvim", "spicetify-nix": "spicetify-nix", "swww": "swww" } }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ] @@ -736,7 +488,7 @@ }, "swww": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nixpkgs": "nixpkgs_5", "utils": "utils" }, @@ -784,45 +536,9 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1726560853, diff --git a/flake.nix b/flake.nix index 7f6c563..5ca40a8 100755 --- a/flake.nix +++ b/flake.nix @@ -14,17 +14,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - #stylix.url = "github:danth/stylix"; - nixcord = { url = "github:kaylorben/nixcord"; }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - grub2-themes = {url = "github:vinceliuice/grub2-themes";}; # is this necessary? (aren't I enabling it in `configuration.nix` anyways?) @@ -39,9 +32,7 @@ home-manager, hyprland, grub2-themes, - nixvim, nixcord, - #stylix, ... } @ inputs: let system = "x86_64-linux"; @@ -63,7 +54,6 @@ modules = [ ./hosts/myputer grub2-themes.nixosModules.default - #stylix.nixosModules.stylix ]; }; @@ -76,19 +66,5 @@ ]; }; }; - - /* - homeConfigurations = { - me = home-manager.lib.homeManagerConfiguration { - specialArgs = {inherit inputs;}; - - modules = [ - ./home/me - #nixcord.homeManagerModules.nixcord - #nixvim.homeManagerModules.nixvim - ]; - }; - }; - */ }; } diff --git a/homes/me/default.nix b/homes/me/default.nix index 41f231f..d899f66 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -34,25 +34,6 @@ }; */ - # ----- STYLIX ----- - - #stylix = { - # enable = true; - # - # image = pkgs.fetchurl { - # url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; - # sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; - # }; - # - # # Stylix will automatically theme applications - # autoEnable = true; - # targets = { - # # disable Stylix's themes for ones I will theme manually - # firefox.enable = false; - # wofi.enable = false; - # }; - #}; - home = { username = "me"; homeDirectory = "/home/me"; @@ -66,6 +47,37 @@ }; }; + gtk = { + enable = true; + font.name = "Victor Mono SemiBold 12"; + theme = { + name = "Dracula"; + package = pkgs.dracula-theme; + }; + iconTheme = { + name = "kora"; + package = pkgs.kora-icon-theme; + }; + # TODO: use a variable to mirror this cursor size + # with the `home.pointerCurser.size` + cursorTheme = { + # dont set the theme (use system default instead) + # only set size to match the system + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + size = 16; + }; + }; + + # TODO: this lowkey doesnt work... (maybe the name "Dracula" is wrong?) + qt = { + enable = true; + style = { + name = "Dracula"; + package = pkgs.dracula-qt5-theme; + }; + }; + programs = { # these are both required for home-manager to work home-manager.enable = true; @@ -185,6 +197,7 @@ statusline = { left = [ "mode" + "spacer" "version-control" "spinner" ]; @@ -196,10 +209,8 @@ right = [ "position" "total-line-numbers" - "separator" "file-encoding" "file-line-ending" - "separator" "file-type" ]; separator = "|"; diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index f4185d5..9af4fc4 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -107,16 +107,6 @@ in { firefox nitch starfetch - tldr - ]; - }; - - # programming/development account - dev = { - isNormalUser = true; - extraGroups = ["wheel"]; - shell = pkgs.bash; #pkgs.zsh - packages = with pkgs; [ ]; }; @@ -128,6 +118,23 @@ in { packages = with pkgs; [ ]; }; + + # # programming/development account + # dev = { + # isNormalUser = true; + # extraGroups = ["wheel"]; + # shell = pkgs.bash; #pkgs.zsh + # packages = with pkgs; [ + # ]; + # }; + + # user for friends to ssh into + friends = { + isNormalUser = true; + shell = pkgs.fish; + packages = with pkgs; [ + ]; + }; }; }; @@ -135,7 +142,6 @@ in { users.me = import ../../homes/me; sharedModules = [ inputs.nixcord.homeManagerModules.nixcord - #inputs.nixvim.homeManagerModules.nixvim ]; }; @@ -148,6 +154,7 @@ in { easyeffects ani-cli wl-clipboard # clipboard for wayland + kcalc # TEMP: (FOR TESTING) python311 # I use 3.11 since it's in a pretty stable state now poetry # python dependency management and packaging @@ -159,6 +166,7 @@ in { curlie zoxide doggo + tldr # Pretty necessary git @@ -168,19 +176,17 @@ in { # Unix Commands wget tree + unzip ]; # Enable the use of certain programs programs = { hyprland = { enable = true; - # set the flake package package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - # make sure to also set the portal package, so that they are in sync portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; xwayland.enable = true; - #systemd.enable = true; }; zsh.enable = true; @@ -237,21 +243,6 @@ in { }; }; - # ----- STYLIX ----- - - #stylix = { - # enable = true; - # image = pkgs.fetchurl { - # url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; - # sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; - # }; - # - # # Stylix will automatically theme applications - # #autoEnable = true; - # #image = ../../wallpapers/wall.png; - # #image = "/home/me/nixdots/wallpapers/ghibli-esque-valley.png"; - #}; - # Enable the new CLI commands and the flakes as experimental features nix.settings.experimental-features = [ "nix-command"