Compare commits

..

No commits in common. "0fc551c8c59311763bd501cb1bc216ae9d75d934" and "c183a0a5510e1519bc8fd3bc9b56edad26d5d1d4" have entirely different histories.

3 changed files with 29 additions and 38 deletions

31
flake.lock generated
View File

@ -21,17 +21,16 @@
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1754405784,
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github"
}
},
@ -143,11 +142,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1763992789,
"narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
"lastModified": 1753592768,
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
"type": "github"
},
"original": {
@ -159,11 +158,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1762847253,
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
"lastModified": 1753122741,
"narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
"rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
"type": "github"
},
"original": {
@ -191,11 +190,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1763622513,
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
"lastModified": 1753489912,
"narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
"rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701",
"type": "github"
},
"original": {
@ -274,11 +273,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1763845106,
"narHash": "sha256-S3HH655nydKoLTuqX8qcJidZH0PiWGB/YcoPomH1DaQ=",
"lastModified": 1753733105,
"narHash": "sha256-zxAiwoYqjesNbV46vGZe9ONvazQDPswnHfhsvvzqkU4=",
"owner": "danth",
"repo": "stylix",
"rev": "b9b8173a6e31c6d06f328307ddbdf7d6af82b7ad",
"rev": "8340949b7cba126b6939ae588e6619f8e23bba9d",
"type": "github"
},
"original": {

View File

@ -4,7 +4,7 @@
inputs,
...
}: {
imports = [./hardware-configuration.nix ];
imports = [./hardware-configuration.nix];
nixpkgs.config.allowUnfree = true;
system.autoUpgrade.enable = true;
@ -27,8 +27,8 @@
gc.automatic = false;
settings = {
experimental-features = ["nix-command" "flakes"];
#substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
#trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
};
};
@ -54,13 +54,12 @@
};
services = {
hardware.bolt = {enable = true;};
xserver = {
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
hardware.bolt = {enable = false;};
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
gnome.core-apps.enable = false;
desktopManager.plasma6.enable = true;
pipewire = {
enable = true;
alsa.enable = true;
@ -86,13 +85,13 @@
lidSwitchExternalPower = "suspend";
};
avahi = {
enable = false;
enable = true;
nssmdns4 = true;
openFirewall = true;
openFirewall = true; # If you have a firewall enabled
};
blueman.enable = true;
fwupd.enable = true;
fwupd.enable = false;
printing.enable = true;
fprintd.enable = true;
thermald.enable = true;
@ -144,12 +143,6 @@
programs = {
zsh.enable = true;
virt-manager.enable = true;
};
virtualisation = {
libvirtd = {enable = true;};
kvmgt = {enable = true;};
};
users.users.k = {
@ -173,7 +166,7 @@
};
systemd.sleep.extraConfig = ''
HibernateDelaySec=20m
HibernateDelaySec=30m
SuspendState=mem
'';

View File

@ -6,7 +6,6 @@
}: {
imports = [
../home/home_common.nix
../home/gnome.nix
];
nixpkgs.config.allowUnfree = true;
@ -20,7 +19,6 @@
blender
vesktop
spotify
alacritty
btop
zip
@ -44,7 +42,7 @@
emacs = {
enable = true;
package = pkgs.emacs-pgtk.override{withTreeSitter=true; withNativeCompilation=true;};
package = pkgs.emacs-pgtk;
extraPackages = epkgs: [
epkgs.vterm
];
@ -62,6 +60,7 @@
emacs = {
enable = true;
defaultEditor = true;
package = pkgs.emacs-pgtk;
};
};
stylix = {