Compare commits

..

No commits in common. "023cd7e6199ed73c4675533f1d4d07a96b132ff3" and "2004523cabaa6c2ee7aff73d9625375da1fabdde" have entirely different histories.

5 changed files with 40 additions and 111 deletions

View file

@ -65,11 +65,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1719911417, "lastModified": 1719245815,
"narHash": "sha256-1voeH5QpRIxl+JW5eJRYKpYqRQFsKiinMeUJ5ZQCS38=", "narHash": "sha256-BiDNkoh9a2dx2OTUFpzWhkGq5WfatG7sUX4Kw0Fdo7g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a84a0ab3a00ec3042de1b7f14e910296970f38a2", "rev": "b6082d10feac69203dac419818daa47c5fe36464",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,11 +268,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1719909389, "lastModified": 1719104979,
"narHash": "sha256-d6PZ7WpOV+yb4u4P+8vJ+xmRZbZxiQCpjNnqYoUTBQc=", "narHash": "sha256-7gcMYBV2uYJyR01ILS6919t9wGGQtC5oTMLFTTEnOhM=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "fc97ecc3e3186b9dfe958869178bdb6b8cd7d8df", "rev": "a982e5ce260e8191a2a24fa62e9e5bdf488bb5d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +289,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719827439, "lastModified": 1719180626,
"narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +364,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1719786368, "lastModified": 1719266290,
"narHash": "sha256-cXZ+LLf+fe/HUN4oiI+KAydOdbCzx+gJxwG4x5gE9iw=", "narHash": "sha256-Uo5/BVrCzBTJySygnSzGNhb+pQe1YB5GJvMn9ExVIiw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "d7ea1b7785f31e9fd6477490309721a19a835592", "rev": "4dd2b5902e770eeaf84820eccfebb5451aedb6a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -445,11 +445,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719316102, "lastModified": 1718804078,
"narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719067853, "lastModified": 1718119275,
"narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "914f083741e694092ee60a39d31f693d0a6dc734", "rev": "1419520d5f7f38d35e05504da5c1b38212a38525",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -548,11 +548,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719832725, "lastModified": 1719111455,
"narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "2917972ed34ce292309b3a4976286f8b5c08db27", "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719895800, "lastModified": 1719145664,
"narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719690277, "lastModified": 1719075281,
"narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -698,11 +698,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1719911046, "lastModified": 1719300525,
"narHash": "sha256-GMHbE8MbUK886x26Y/9uAtutxodlhHwfzDRuC6qLxHA=", "narHash": "sha256-pXDgjMu9PlnSPe6mFjmCnLjSZP1voYVJiClIm7Yn/8g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8188fcb8f4b2525d89372d044168c6aac458453f", "rev": "db4b034aef336492d25f8be92d2a12cbdec0695f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -714,11 +714,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719663039, "lastModified": 1719122173,
"narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "rev": "906320ae02f769d13a646eb3605a9821df0d6ea2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -730,11 +730,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719690277, "lastModified": 1719075281,
"narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -66,9 +66,8 @@
{ {
environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath;
nix.nixPath = [ nix.nixPath = [
"nixpkgs=/etc/nix/inputs/nixpkgs" "nixpkgs=/etc/nix/inputs/nixpkgs"
"nixos=/etc/nix/inputs/nixpkgs" "nixos-config=/home/ultra/.nixdotfiles"
"nixos-config=/home/ultra/.nixdotfiles"
]; ];
} }

View file

@ -127,8 +127,7 @@ in {
qFlipper qFlipper
remmina remmina
]; ];
shell = pkgs.zsh; shell = pkgs.fish;
ignoreShellProgramCheck = true; # I configured zsh with home-manager
}; };
environment.variables = { environment.variables = {
@ -198,7 +197,6 @@ in {
# NVIDIA # NVIDIA
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
driSupport32Bit = true;
}; };
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];

View file

@ -117,5 +117,3 @@
(add-hook 'prog-mode-hoow 'rainbow-mode) (add-hook 'prog-mode-hoow 'rainbow-mode)
(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)
(define-key eshell-mode-map [remap eshell-pcomplete] 'helm-esh-pcomplete)

View file

@ -61,11 +61,6 @@ let
geiser geiser
rainbow-delimiters rainbow-delimiters
rainbow-mode rainbow-mode
esh-autosuggest
fish-completion
steam
zone-sl
helm
]; ];
}); });
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
@ -128,7 +123,7 @@ in {
zoom-us zoom-us
google-chrome google-chrome
zoxide zoxide
# starship starship
atuin atuin
clang clang
(lib.hiPrio gcc) (lib.hiPrio gcc)
@ -264,7 +259,6 @@ in {
(inputs.nix-inst.packages.${pkgs.system}.default) (inputs.nix-inst.packages.${pkgs.system}.default)
dotnet-runtime_6 dotnet-runtime_6
tea tea
thefuck
]; ];
file = { file = {
"emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el; "emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el;
@ -295,66 +289,6 @@ in {
}; };
home-manager.enable = true; home-manager.enable = true;
# fish.enable = true; # fish.enable = true;
zsh = {
enable = true;
enableCompletion = true;
autocd = true;
autosuggestion = {
enable = true;
};
syntaxHighlighting = {
enable = true;
};
shellAliases = {
cls = "clear";
hmup = "nh home switch ~/.nixdotfiles";
osup = "nh os switch ~/.nixdotfiles";
# emcc = "emacsclient -c";
};
oh-my-zsh = {
enable = true;
plugins = [ "git" "thefuck" "history-substring-search" "fzf" ];
theme = "cloud";
};
history = {
size = 256 * 1024;
path = "${config.xdg.dataHome}/zsh/history";
extended = true;
};
initExtra = ''
eval $(thefuck --alias)
eval $(starship init zsh)
'';
zsh-abbr = {
enable = true;
abbreviations = {
emcc = "emacsclient -c";
sam = "git commit -sam";
hmbk = "home-manager switch --flake ~/.nixdotfiles -b backup";
};
};
};
zoxide = {
enable = true;
enableNushellIntegration = true;
enableZshIntegration = true;
};
starship = {
enable = true;
settings = {
"$schema" = "https://starship.rs/config-schema.json";
add_newline = false;
character = {
success_symbol = "[](bold green)";
error_symbol = "[](bold red)";
};
format = ''
$directory$git$nodejs$container$sudo$nix_shell$character
'';
};
};
# Helix config # Helix config
helix = { helix = {