Henry-Hiles/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some changes

Browse source
This commit is contained in:
Henry Hiles 2023-10-04 11:01:27 -04:00
parent 8793835fdc
commit 7c7e281b3c
9 changed files with 141 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common.nix
View file

@ -16,7 +16,7 @@
users.quadradical = { users.quadradical = {
isNormalUser = true; isNormalUser = true;
description = "QuadRadical"; description = "QuadRadical";
extraGroups = ["networkmanager" "wheel" "wireshark"]; extraGroups = ["networkmanager" "wheel" "wireshark" "libvirtd" "libvirt" "input" "kvm"];
}; };
}; };
@ -53,7 +53,6 @@
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
exa
micro micro
rmtrash rmtrash
prettyping prettyping
@ -64,6 +63,5 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
time.timeZone = "America/Toronto"; time.timeZone = "America/Toronto";
i18n.defaultLocale = "en_CA.UTF-8"; i18n.defaultLocale = "en_CA.UTF-8";
hardware.pulseaudio.enable = false;
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = ["nix-command" "flakes"];
} }

147
flake.lock generated
View file

@ -1,21 +1,5 @@
{ {
"nodes": { "nodes": {
"adwaita-steam": {
"flake": false,
"locked": {
"lastModified": 1691923029,
"narHash": "sha256-0V0+knSgaiWO6CrOEowM2VIDM+Gi0GBxgzAio4rlvSk=",
"owner": "tkashkin",
"repo": "Adwaita-for-Steam",
"rev": "984b39e1dabebaeb6e718fa240824ae3e0e6c6aa",
"type": "github"
},
"original": {
"owner": "tkashkin",
"repo": "Adwaita-for-Steam",
"type": "github"
}
},
"base16": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@ -37,11 +21,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1691114147, "lastModified": 1696121307,
"narHash": "sha256-0IS5na2WRSNWNygHhmZOcXhdrx2aFhCDQY8XVVeHf8Q=", "narHash": "sha256-jmYHoZYx2/dSvDH/khg7vi2qaKKuXK1g8pnvcRyLw/4=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "08884fb6be1c74a81f5e0a35a81c3f219e109028", "rev": "ecac4b99d490e57af2c0d5ffa89b5923ca838a35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -66,6 +50,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1693611461,
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -89,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692260837, "lastModified": 1696409884,
"narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=", "narHash": "sha256-hz3i4wFJHoTIAEI19oF1fiPn6TpV+VuTSOrSHUoJMgs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6a94c1a59737783c282c4031555a289c28b961e4", "rev": "8aef005d44ee726911e9f793495bb40f2fbf5a05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +112,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689134369, "lastModified": 1691882297,
"narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", "narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", "rev": "c3ab5ea047e6dc73df530948f7367455749d8906",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -123,13 +125,34 @@
"type": "github" "type": "github"
} }
}, },
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1696332552,
"narHash": "sha256-chsT/zHLDn1+gOACWtQmZrSWlVPTuNBYCSa9uZkQsvE=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "cd66002bb827370c9076cadda5584b7ed15f7480",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1692174805, "lastModified": 1696193975,
"narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,43 +162,46 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-google": { "nixpkgs-lib": {
"locked": { "locked": {
"dirtyRev": "4c85ec65e1b1a944292d920e8787ba9ed64e60c0-dirty", "dir": "lib",
"dirtyShortRev": "4c85ec65e1b-dirty", "lastModified": 1693471703,
"lastModified": 1692221574, "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
"narHash": "sha256-V2IuHXUFHFPjaOTmKF74z4MnQFMI4VAZs9gYmj+qxXQ=", "owner": "NixOS",
"type": "git",
"url": "file:/home/quadradical/Documents/Code/nixpkgs/"
},
"original": {
"type": "git",
"url": "file:/home/quadradical/Documents/Code/nixpkgs/"
}
},
"nixpkgs-heroic": {
"locked": {
"lastModified": 1691099305,
"narHash": "sha256-Yg3OGAt+wSakpBJoZNb1zuVU/kLPxOfbCXTWe11GeD0=",
"owner": "aidalgol",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4523c65f95093a267ffe545a4be67a0d8773e0d5", "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "aidalgol", "dir": "lib",
"ref": "heroic-2.9", "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1696429540,
"narHash": "sha256-5E1T5OQkImk3hsZ9D7xpGbEGt/8bD8ciZyYS9/laPz4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "91782588964678a13e7aa4b90910964d9db56314",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1690441914, "lastModified": 1691853136,
"narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", "rev": "f0451844bbdf545f696f029d1448de4906c7f753",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -193,11 +219,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1692276395, "lastModified": 1696377142,
"narHash": "sha256-FPnMYkd8Q7SmREGA2c7VrR2PPG2crSYMQe08xYiwSc4=", "narHash": "sha256-yTAncJAehy+w+4VLGZANE3kI6wa9+nklyD0mU49BJZE=",
"owner": "wamserma", "owner": "wamserma",
"repo": "flake-programs-sqlite", "repo": "flake-programs-sqlite",
"rev": "0d46a2c7b9ac7db45f738088e1d0cd6925fa15a3", "rev": "2ac582da8e6d9fb4917bda7fc89ca5253365d6f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,12 +234,11 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"adwaita-steam": "adwaita-steam",
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-google": "nixpkgs-google", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-heroic": "nixpkgs-heroic",
"programsdb": "programsdb", "programsdb": "programsdb",
"stylix": "stylix" "stylix": "stylix"
} }
@ -226,11 +251,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1691942466, "lastModified": 1694375893,
"narHash": "sha256-bK6FFbsKtyLKJLwgHerWp/EMMoWqE0UJk0KEbgYICbY=", "narHash": "sha256-oJGESNjJ/6o6tfuUavBZ7go4Oun7g9YKv7OqaQaY/80=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "beb35709c9a769a5f279d3177af778a15dcbda46", "rev": "c3c9f4784b4f08f6676340126858d936edbce1fa",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -1,16 +1,15 @@
{ {
inputs = { inputs = {
nixpkgs-heroic.url = "github:aidalgol/nixpkgs?ref=heroic-2.9"; nixpkgs-master.url = "github:nixos/nixpkgs";
nixpkgs-google.url = "git+file:/home/quadradical/Documents/Code/nixpkgs/";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
firefox-gnome-theme = { firefox-gnome-theme = {
url = "github:rafaelmardojai/firefox-gnome-theme"; url = "github:rafaelmardojai/firefox-gnome-theme";
flake = false; flake = false;
}; };
adwaita-steam = { nix-gaming = {
url = "github:tkashkin/Adwaita-for-Steam"; url = "github:fufexan/nix-gaming";
flake = false; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -37,13 +36,14 @@
}; };
modules = modules =
[ [
./common.nix
"${self}/${hostname}/configuration.nix" "${self}/${hostname}/configuration.nix"
"${self}/${hostname}/hardware-configuration.nix" "${self}/${hostname}/hardware-configuration.nix"
./common.nix inputs.nix-gaming.nixosModules.pipewireLowLatency
] ]
++ nixpkgs.lib.optionals (builtins.pathExists "${self}/${hostname}/home-manager.nix") [ ++ nixpkgs.lib.optionals (builtins.pathExists "${self}/${hostname}/home-manager.nix") [
home-manager.nixosModules.home-manager
"${self}/${hostname}/home-manager.nix" "${self}/${hostname}/home-manager.nix"
home-manager.nixosModules.home-manager
] ]
++ nixpkgs.lib.optionals (builtins.pathExists "${self}/${hostname}/stylix.nix") [ ++ nixpkgs.lib.optionals (builtins.pathExists "${self}/${hostname}/stylix.nix") [
stylix.nixosModules.stylix stylix.nixosModules.stylix

7
home-manager/direnv.nix Normal file
View file

@ -0,0 +1,7 @@
{
programs.direnv = {
enable = true;
enableFishIntegration = true;
nix-direnv.enable = true;
};
}

2
home-manager/exa.nix → home-manager/eza.nix
View file

@ -1,5 +1,5 @@
{ {
programs.exa = { programs.eza = {
enable = true; enable = true;
enableAliases = true; enableAliases = true;
icons = true; icons = true;

2
home-manager/gtk.nix
View file

@ -13,7 +13,7 @@
cursorTheme = { cursorTheme = {
name = "GoogleDot-Blue"; name = "GoogleDot-Blue";
package = inputs.nixpkgs-google.legacyPackages.x86_64-linux.google-cursor; package = pkgs.google-cursor;
}; };
}; };
} }

16
home-manager/vscode.nix
View file

@ -3,15 +3,17 @@
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
mkhl.direnv
eamodio.gitlens eamodio.gitlens
usernamehw.errorlens
timonwong.shellcheck timonwong.shellcheck
usernamehw.errorlens
kamadorueda.alejandra
ritwickdey.liveserver ritwickdey.liveserver
dbaeumer.vscode-eslint dbaeumer.vscode-eslint
esbenp.prettier-vscode esbenp.prettier-vscode
oderwat.indent-rainbow oderwat.indent-rainbow
astro-build.astro-vscode astro-build.astro-vscode
vscode-icons-team.vscode-icons pkief.material-icon-theme
streetsidesoftware.code-spell-checker streetsidesoftware.code-spell-checker
arcticicestudio.nord-visual-studio-code arcticicestudio.nord-visual-studio-code
]; ];
@ -26,7 +28,6 @@
} }
]; ];
userSettings = { userSettings = {
"editor.bracketPairColorization.enabled" = true;
"editor.guides.bracketPairs" = "active"; "editor.guides.bracketPairs" = "active";
"window.dialogStyle" = "custom"; "window.dialogStyle" = "custom";
"editor.inlineSuggest.enabled" = true; "editor.inlineSuggest.enabled" = true;
@ -55,6 +56,7 @@
"gitlens.currentLine.enabled" = false; "gitlens.currentLine.enabled" = false;
"gitlens.codeLens.enabled" = false; "gitlens.codeLens.enabled" = false;
"workbench.colorTheme" = "Nord"; "workbench.colorTheme" = "Nord";
"workbench.iconTheme" = "material-icon-theme";
"typescript.updateImportsOnFileMove.enabled" = "always"; "typescript.updateImportsOnFileMove.enabled" = "always";
"editor.wordWrap" = "on"; "editor.wordWrap" = "on";
"[astro]" = { "[astro]" = {
@ -65,6 +67,14 @@
"editor.minimap.enabled" = false; "editor.minimap.enabled" = false;
"diffEditor.ignoreTrimWhitespace" = false; "diffEditor.ignoreTrimWhitespace" = false;
"editor.unicodeHighlight.nonBasicASCII" = false; "editor.unicodeHighlight.nonBasicASCII" = false;
"dart.checkForSdkUpdates" = false;
"editor.codeActionsOnSave" = {
"source.fixAll" = true;
};
"editor.bracketPairColorization.enabled" = true;
"explorer.fileNesting.enabled" = true;
"explorer.fileNesting.expand" = false;
"window.zoomLevel" = 1;
}; };
}; };
} }

38
quadraticpc/configuration.nix
View file

@ -30,7 +30,7 @@
intelBusId = "PCI:00:02:0"; intelBusId = "PCI:00:02:0";
nvidiaBusId = "PCI:01:00:0"; nvidiaBusId = "PCI:01:00:0";
}; };
open = true; open = false;
nvidiaSettings = false; nvidiaSettings = false;
modesetting.enable = true; modesetting.enable = true;
nvidiaPersistenced = true; nvidiaPersistenced = true;
@ -43,6 +43,11 @@
networkmanager.enable = true; networkmanager.enable = true;
}; };
nix.settings = {
substituters = ["https://nix-gaming.cachix.org"];
trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="];
};
services = { services = {
earlyoom = { earlyoom = {
enable = true; enable = true;
@ -62,6 +67,7 @@
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
lowLatency.enable = true;
}; };
avahi = { avahi = {
@ -82,11 +88,11 @@
sessionVariables = { sessionVariables = {
MANGOHUD = "1"; MANGOHUD = "1";
XDG_DATA_HOME = "$HOME/.local/share";
EDITOR = "micro"; EDITOR = "micro";
VISUAL = "micro"; VISUAL = "micro";
NIXOS_OZONE_WL = "1";
fish_greeting = ""; fish_greeting = "";
NIXOS_OZONE_WL = "1";
GAMEMODERUNEXEC = "nvidia-offload";
}; };
systemPackages = with pkgs; ([ systemPackages = with pkgs; ([
@ -94,21 +100,28 @@
tldr tldr
tuba tuba
gimp gimp
heroic
aspell aspell
nodejs nodejs
killall killall
armcord
ripgrep ripgrep
hyfetch hyfetch
inkscape inkscape
pciutils
r2modman r2modman
pciutils
alejandra
grapejuice
libreoffice libreoffice
mediawriter mediawriter
virt-manager
wl-clipboard
android-studio
nodePackages.pnpm nodePackages.pnpm
hunspellDicts.en_CA-large hunspellDicts.en_CA-large
wineWowPackages.stagingFull (pkgs.discord.override {
inputs.nixpkgs-heroic.legacyPackages.x86_64-linux.heroic withOpenASAR = true;
withVencord = true;
})
] ]
++ (with gnomeExtensions; [ ++ (with gnomeExtensions; [
caffeine caffeine
@ -130,6 +143,7 @@
enable = true; enable = true;
package = pkgs.wireshark; package = pkgs.wireshark;
}; };
gamemode.enable = true;
fish.interactiveShellInit = "neofetch"; fish.interactiveShellInit = "neofetch";
}; };
@ -138,15 +152,9 @@
memoryPercent = 100; memoryPercent = 100;
}; };
system = { system.stateVersion = "23.05";
autoUpgrade = {
enable = true;
flake = "/home/quadradical/.config/nixos/flake.nix";
operation = "boot";
};
stateVersion = "23.05";
};
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
virtualisation.libvirtd.enable = true;
} }

3
quadraticpc/home-manager.nix
View file

@ -15,10 +15,11 @@
} }
../home-manager/gtk.nix ../home-manager/gtk.nix
../home-manager/bat.nix ../home-manager/bat.nix
../home-manager/exa.nix ../home-manager/eza.nix
../home-manager/git.nix ../home-manager/git.nix
../home-manager/btop.nix ../home-manager/btop.nix
../home-manager/vscode.nix ../home-manager/vscode.nix
../home-manager/direnv.nix
../home-manager/firefox.nix ../home-manager/firefox.nix
../home-manager/neofetch.nix ../home-manager/neofetch.nix
../home-manager/mangohud.nix ../home-manager/mangohud.nix