Compare commits

..

No commits in common. "503f801092444041ca55c54fce291091132401bf" and "d6d117276ce290e55ed0962492283ab349a48705" have entirely different histories.

4 changed files with 66 additions and 100 deletions

View file

@ -65,11 +65,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1713892023, "lastModified": 1713318396,
"narHash": "sha256-Db02rcyvMSjHlOu/xPX4kvc8HDOUxTX0MldcUcAe/zM=", "narHash": "sha256-AgT6tQGmbAeF2AqnkYtwks1i6o2Z+cQz8WLd0DVfsEs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "404b72d67877f73f029ddc77848a85e7d0f6edd0", "rev": "68ed87aa28ef073f9e6a482977f07591aae61639",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,11 +109,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1713730154, "lastModified": 1713106678,
"narHash": "sha256-LHwfc+Mexlqewfjm2onPz74ZMRf/n+e7aAuYz08qPUE=", "narHash": "sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "acf57a8396d19cd160786223b04b950509e46a4b", "rev": "1e37f53e99016aa2cd725d7050788bb5d4fcc76a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1713879663, "lastModified": 1713312365,
"narHash": "sha256-hIwbELgx8E40jwnVI2d8pumR811c10cU0OSzugyp2AA=", "narHash": "sha256-vdBt7ZB4m2ep15H24FzqtFcq0kiUXCj2M8m+5K7ueP0=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "89a9f2be788017615f6d2406d4e12f50949a5492", "rev": "1cce693bef8e1e5bbfdc913429232da1a6aa572c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +275,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713894582, "lastModified": 1713294767,
"narHash": "sha256-pHJYZIVFmzPAwyTfcMGJwlfz18nOsS4p0CuDnI1EDL4=", "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "33a20182e3164f451b6a4ac2ecadcab5c2c36703", "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,11 +295,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713780596, "lastModified": 1712505318,
"narHash": "sha256-DDAYNGSnrBwvVfpKx+XjkuecpoE9HiEf6JW+DBQgvm0=", "narHash": "sha256-fzlBLhXUN6y7mzEtcGNRDXxFakBEfaj4Bmj5PuoCNaM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "110e6dc761d5c3d352574def3479a9c39dfc4358", "rev": "5870244b592c22558b658dbaf94f9e41afb0316f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713612213, "lastModified": 1713214463,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,7 +342,6 @@
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -351,11 +350,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1713886692, "lastModified": 1713296181,
"narHash": "sha256-q/vi+a8LnfdT1VQMszZ350N6/si0geQjJroatj7MXOI=", "narHash": "sha256-c2hUYlSi7QOful5lIEWVRl1dborfctAvWY9CwoTLxXI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "bb4646bbdf7d3490c2442347d852a62470aec2aa", "rev": "e8e02e81e84bb04efa0c926361ec80c60744f665",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,31 +413,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1713730424,
"narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"mailserver": { "mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
@ -469,11 +443,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713635132, "lastModified": 1713299899,
"narHash": "sha256-lLftlafVmv9RPzCO7gTsswiD+Q0MoAP0FVXVoK3iGmE=", "narHash": "sha256-SZ7S/JAXRA6Ofw3/RxGaZs1RrTXL1oY2j//obRqeftI=",
"owner": "viperML", "owner": "viperML",
"repo": "nh", "repo": "nh",
"rev": "6c772f572fd17ed9181625e221e2365e9bffc3f6", "rev": "d10c7fb30604f913ba95d650f77002b9c992d8ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +478,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713869268, "lastModified": 1713067146,
"narHash": "sha256-o3CMQeu/S8/4zU0pMtYg51rd1FWdJsI2Xohzng1Ysdg=", "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "dcb6ac44922858ce3a5b46f77a36d6030181460c", "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -526,11 +500,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713821910, "lastModified": 1713320630,
"narHash": "sha256-2lfgToismP2bjTuSjpzUQ0sAfcDOb6D7VGD5zlbsWF4=", "narHash": "sha256-G0OtDFevvwgu0UrVOXeIvs2czRvNdJbahIfMky/cZmw=",
"ref": "refs/heads/trunk", "ref": "refs/heads/trunk",
"rev": "31d38e7fccfef150911d65f30ac3f2971b0976c2", "rev": "a5ce5ae590dbffe93fcc38446f0d7e33a1f05229",
"revCount": 64, "revCount": 28,
"type": "git", "type": "git",
"url": "http://git.envs.net/binarycat/nix-inst" "url": "http://git.envs.net/binarycat/nix-inst"
}, },
@ -562,11 +536,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1713864415, "lastModified": 1712909959,
"narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +551,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713714899, "lastModified": 1713248628,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -611,11 +585,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1713899707, "lastModified": 1713329080,
"narHash": "sha256-ViR8NsU1/viLBLse57WC/vh8AmyO8k2ll+kC0WVaQ/o=", "narHash": "sha256-w3dysj6ZeVkCAlACWI6MdsqtAJgP3o2cYrZFUnQYjFs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "867e97bdcf0229b84a9e3dd2ba398332aa40315f", "rev": "eb2afad8133b6b35f54ce4532481dcc1f9748923",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,11 +601,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1713725259, "lastModified": 1713145326,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -643,11 +617,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713714899, "lastModified": 1713248628,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -685,11 +659,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708999822, "lastModified": 1708395022,
"narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", "narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", "rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,17 +841,17 @@
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713731601, "lastModified": 1713124002,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "wlroots-hyprland", "repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "rev": "611a4f24cd2384378f6e500253983107c6656c64",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"repo": "wlroots-hyprland", "repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "rev": "611a4f24cd2384378f6e500253983107c6656c64",
"type": "github" "type": "github"
} }
}, },
@ -901,11 +875,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713724432, "lastModified": 1713214484,
"narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "9ace6f969ce495185df34cc6254fb9d297765478", "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,7 +6,7 @@ inputs: { config, pkgs, lib, ... }:
let let
# nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center; # nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center;
# doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default; # doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default;
# nh = inputs.nix-but-gigachad.packages.${pkgs.system}.default; nh = inputs.nix-but-gigachad.packages.${pkgs.system}.default;
in { in {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
@ -23,13 +23,12 @@ in {
# ( import ./services/caddy.nix inputs ) # doesn't work # ( import ./services/caddy.nix inputs ) # doesn't work
# ( import ./services/dnsmasq.nix inputs ) # borks my DNS # ( import ./services/dnsmasq.nix inputs ) # borks my DNS
# ( import ./services/mail-server.nix inputs ) # needs a lot of DNS configs from cloudflaer, I only have 3 rules # ( import ./services/mail-server.nix inputs ) # needs a lot of DNS configs from cloudflaer, I only have 3 rules
# inputs.nix-but-gigachad.nixosModules.default inputs.nix-but-gigachad.nixosModules.default
]; ];
# nh = { nh = {
# enable = true; enable = true;
# clean.enable = true; clean.enable = true;
# flake = "/home/ultra/.nixdotfiles"; };
# };
fonts = { fonts = {
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
@ -200,11 +199,6 @@ in {
enable = true; enable = true;
}; };
command-not-found.enable = true; command-not-found.enable = true;
nh = {
enable = true;
clean.enable = true;
flake = "/home/ultra/.nixdotfiles";
};
}; };
# programs.nushell.enable = true; # programs.nushell.enable = true;
# users.defaultUserShell = pkgs.zsh; # users.defaultUserShell = pkgs.zsh;

View file

@ -26,9 +26,8 @@
swapDevices = [ swapDevices = [
{ {
device = "/var/lib/swapfile"; device = "/var/lib/swapfile";
size = 16 * 1024; size = 64 * 1024;
} }
{ {
device = "/dev/sda2"; device = "/dev/sda2";
} }

View file

@ -60,14 +60,14 @@ let
]; ];
}); });
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
nixpkgs-master-pkgs = inputs.nixpkgs-master.legacyPackages.${pkgs.system}; # nixpkgs-master-pkgs = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
# nixpkgs-master = inputs.nixpkgs-master; # nixpkgs-master = inputs.nixpkgs-master;
nixpkgs-master = import inputs.nixpkgs-master { nixpkgs-master = import inputs.nixpkgs-master {
inherit (config.nixpkgs) config overlays; inherit (config.nixpkgs) config overlays;
inherit (pkgs) system; inherit (pkgs) system;
}; };
hypr-contrib = inputs.hypr-contrib.packages.${pkgs.system}; hypr-contrib = inputs.hypr-contrib.packages.${pkgs.system};
# nh = inputs.nix-but-gigachad.packages.${pkgs.system}.default; # IT GOT UPSTREAMED WOOO nh = inputs.nix-but-gigachad.packages.${pkgs.system}.default;
in { in {
imports = [ imports = [
inputs.hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules.default
@ -145,8 +145,7 @@ in {
w3m w3m
github-cli github-cli
mc mc
# zellij zellij
(nixpkgs-master-pkgs.zellij)
lsd lsd
tealdeer tealdeer
fd fd