xqtc/nixos-config
1
0
Fork 0
mirror of https://git.gay/xqtc/nixos-config synced 2024-11-22 02:40:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

enabling libvirt; fix for nvim-base16 rename in nixpkgs upstrea (waiting on nixos-unstable being propagated)

Browse source
This commit is contained in:
xqtc161 2024-02-19 12:02:16 +01:00
parent 0005228f2a
commit b90817a0f6
5 changed files with 96 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
flake.lock
View file

@ -7,11 +7,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1707969829, "lastModified": 1708315443,
"narHash": "sha256-3OGHlhhJwM9o7Tl1vbC6ehvMZAcGvEhOsd8RKY93VR4=", "narHash": "sha256-kAUx0D/d9TaeEJfZ8UYN7HILUGiLzyNdNkYvOVuyDcc=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "d6054eda1bec2eef94411d88c09f20541ce478a7", "rev": "aaef0f127338365da54d808bcd45799f8dc6d704",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -22,6 +22,20 @@
} }
}, },
"flake-compat": { "flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"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"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -138,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707919853, "lastModified": 1708294481,
"narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "043ba285c6dc20f36441d48525402bcb9743c498", "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +210,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1707842204, "lastModified": 1708091350,
"narHash": "sha256-M+HAq1qWQBi/gywaMZwX0odU+Qb/XeqVeANGKRBDOwU=", "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f1b2f71c86a5b1941d20608db0b1e88a07d31303", "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,40 +240,41 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1707956935, "lastModified": 1708339623,
"narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "narHash": "sha256-Tmn5fWBeL3e+Zput55yjRH7vqrhMyiLjz7VmVpliUtk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "rev": "b3d1fe3b876cdde17803f4ad3d30132d126ff9b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1707956935, "lastModified": 1708247094,
"narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "narHash": "sha256-H2VS7VwesetGDtIaaz4AMsRkPoSLEVzL/Ika8gnbUnE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "rev": "045b51a3ae66f673ed44b5bbd1f4a341d96703bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
@ -269,11 +284,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1708003742, "lastModified": 1708338329,
"narHash": "sha256-Y2ET4HnijBUhVww5qs7bA076UyJq2X1zyKiTTcVP3x8=", "narHash": "sha256-AAxCApUIwIdUN+nwYHK9qVSaQ3q0R2BN4N5oU/SZ1p4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2594863af79adcd140a80e8b1008333198d70830", "rev": "b8815f04a32c2fcff4c10f6a52aab0e030a71060",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,7 +299,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
@ -317,7 +332,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-master": "nixpkgs-master",
"nixvim": "nixvim" "nixvim": "nixvim"
} }
}, },

6
flake.nix
View file

@ -1,8 +1,8 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -17,7 +17,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ {self, nixpkgs, nixpkgs-unstable, firefox-addons, home-manager, nixos-hardware, nixvim, ...}: let outputs = inputs @ {self, nixpkgs, nixpkgs-master, firefox-addons, home-manager, nixos-hardware, nixvim, ...}: let
lib = nixpkgs.lib; lib = nixpkgs.lib;
util = (import ./overlays/util.nix {} {}).util; util = (import ./overlays/util.nix {} {}).util;
system = "x86_64-linux"; system = "x86_64-linux";

64
home/default.nix
View file

@ -15,11 +15,8 @@
enable = true; enable = true;
extraConfig = builtins.readFile ./config-files/wezterm.lua; extraConfig = builtins.readFile ./config-files/wezterm.lua;
}; };
#programs.dconf.enable = true;
#programs.easyeffects.enable = true;
#services.easyeffects.enable = true;
programs = {
programs = {
atuin = { atuin = {
enable = true; enable = true;
enableNushellIntegration = true; enableNushellIntegration = true;
@ -37,49 +34,39 @@
} }
''; '';
}; };
# The config.nu can be anywhere you want if you like to edit your Nushell with Nu
#extraConfig = builtins.readFile ./config-files/config.nu;
}; };
carapace.enable = true; carapace.enable = true;
carapace.enableNushellIntegration = true; carapace.enableNushellIntegration = true;
starship = starship =
let let
flavour = "mocha"; flavour = "mocha";
in in
{ {
enable = true; enable = true;
enableNushellIntegration = true; enableNushellIntegration = true;
settings = { settings = {
# Other config here # Other config here
character = { character = {
success_symbol = "[λ::](bold green)"; success_symbol = "[λ::](bold green)";
error_symbol = "[λ::](bold red)"; error_symbol = "[λ::](bold red)";
}; };
format = "$all"; # Remove this line to disable the default prompt format format = "$all"; # Remove this line to disable the default prompt format
palette = "catppuccin_${flavour}"; palette = "catppuccin_${flavour}";
} // builtins.fromTOML (builtins.readFile } // builtins.fromTOML (builtins.readFile
(pkgs.fetchFromGitHub (pkgs.fetchFromGitHub
{ {
owner = "catppuccin"; owner = "catppuccin";
repo = "starship"; repo = "starship";
rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; # Replace with the latest commit hash rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; # Replace with the latest commit hash
sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
} + /palettes/${flavour}.toml)); } + /palettes/${flavour}.toml));
}; };
#starship = { enable = true;
# settings = {
# add_newline = true;
# character = {
# success_symbol = "[λ::](bold green)";
# error_symbol = "[λ::](bold red)";
# };
# };
#};
}; };
dconf.enable = true; dconf.enable = true;
dconf.settings = { dconf.settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
color-scheme = "prefer-dark"; color-scheme = "prefer-dark";
cursor-theme = "Adwaita";
}; };
}; };
@ -134,7 +121,6 @@
bitwarden-cli bitwarden-cli
sway-contrib.grimshot sway-contrib.grimshot
#zathura
libnotify libnotify

1
home/modules/nixvim.nix
View file

@ -23,6 +23,7 @@
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
bashls.enable = true;
lua-ls.enable = true; lua-ls.enable = true;
nushell.enable = true; nushell.enable = true;
clangd.enable = true; clangd.enable = true;

46
hosts/lilith/default.nix
View file

@ -4,7 +4,7 @@
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../antivirus.nix #../antivirus.nix
../gc.nix ../gc.nix
#nixos-hardware.nixosModules.lenovo.thinkpad.t480 #nixos-hardware.nixosModules.lenovo.thinkpad.t480
#(builtins.getFlake (builtins.fetchGit "github:NixOs/nixos-hardware")).nixosModules.lenovo-thinkpad-t480 #(builtins.getFlake (builtins.fetchGit "github:NixOs/nixos-hardware")).nixosModules.lenovo-thinkpad-t480
@ -43,6 +43,15 @@
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
#dconf.settings = {
# "org/virt-manager/virt-manager/connections" = {
# autoconnect = ["qemu:///system"];
# uris = ["qemu:///system"];
# };
#};
networking.hostName = "lilith"; # Define your hostname. networking.hostName = "lilith"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -113,7 +122,7 @@
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.xqtc = { users.users.xqtc = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. extraGroups = [ "wheel" "libvirtd" ]; # Enable ‘sudo’ for the user.
packages = with pkgs; [ packages = with pkgs; [
nushell nushell
clamtk clamtk
@ -132,12 +141,15 @@
cargo cargo
cargo-generate cargo-generate
sway sway
gnome3.adwaita-icon-theme
glib
#swaylock #swaylock
swaylock-effects swaylock-effects
tofi tofi
waybar waybar
wl-clipboard wl-clipboard
wdisplays wdisplays
#qemu_full
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
]; ];
@ -168,27 +180,27 @@
package = pkgs.mullvad-vpn; package = pkgs.mullvad-vpn;
}; };
networking.nameservers = [ #networking.nameservers = [
#"9.9.9.9#nine.nine.nine.nine" # #"9.9.9.9#nine.nine.nine.nine"
"1.1.1.1#one.one.one.one" # "1.1.1.1#one.one.one.one"
"1.0.0.1#one.zero.zero.one" # "1.0.0.1#one.zero.zero.one"
]; #];
services.resolved = { #services.resolved = {
enable = true; # enable = true;
#dnssec = "true"; # #dnssec = "true";
domains = [ "~." ]; # domains = [ "~." ];
fallbackDns = ["1.1.1.1#one.one.one.one"]; # fallbackDns = ["1.1.1.1#one.one.one.one"];
extraConfig = '' # #extraConfig = ''
MulticastDNS=yes # # MulticastDNS=yes
''; # #'';
}; #};
#networking.wireguard.enable = true; #networking.wireguard.enable = true;
services.tailscale.enable = true; services.tailscale.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 2234 8080 5173 ]; networking.firewall.allowedTCPPorts = [ 22 2234 8080 5173 ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;