michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' of https://git.thomasfamily.duckdns.org/michael/nix-dots

Browse Source
This commit is contained in:
Michael Thomas 2022-06-21 22:34:18 -04:00
commit 66f71f9688
11 changed files with 109 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654591300, "lastModified": 1655723343,
"narHash": "sha256-53a6fimkMTc1DqnzdEWFHbaOT1xlMgeOJaD2/IGO22k=", "narHash": "sha256-J95qdF7m30dEioJZE8fsmaOusqIp57SMJyG4U/ZKfJk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "4de4d6acb7fc868677380496b62a5e51890fc331", "rev": "e178b6df72d79324a8446cd175d9d091223585ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,27 +76,26 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1654442937, "lastModified": 1655456688,
"narHash": "sha256-dYJ79gt85hwIbPlX52eAwnkYzMexLyNRmRcTRpMn+Gw=", "narHash": "sha256-j2trI5gv2fnHdfUQFBy957avCPxxzCqE8R+TOYHPSRE=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca2629644d4a5098004e20cb9ca179345f2acd8e", "rev": "d17a56d90ecbd1b8fc908d49598fb854ef188461",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-22.05", "ref": "nixos-22.05",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1654593979, "lastModified": 1655739339,
"narHash": "sha256-iDvyU5vs7IoPBpxwhNAI/J3llDsmtzH1xYqvCGvzCww=", "narHash": "sha256-ykV5RQgltIJl5EXbGdndf6IcncfCP8RnyH57TyKFazE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "47044837d4ebcaa37e699d92d893a32d4e301852", "rev": "0cadcae82c23de1ec4b4a5bbe1e2f75e59752317",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,22 +110,37 @@
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur", "nur": "nur",
"unstable": "unstable" "unstable": "unstable",
"utils": "utils"
} }
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1654230545, "lastModified": 1655567057,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "rev": "e0a42267f73ea52adc061a64650fddc59906fc99",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "type": "indirect"
}
},
"utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github" "type": "github"
} }
} }

64
flake.nix
View File

@ -2,10 +2,12 @@
description = "Michael Thomas's NixOS configuration"; description = "Michael Thomas's NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "nixpkgs/nixos-22.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
utils.url = "github:numtide/flake-utils";
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs = { inputs = {
@ -21,35 +23,38 @@
}; };
}; };
outputs = { self, nixpkgs, unstable, nur, nixos-wsl, home-manager, ... }@inputs: { outputs = { self, nixpkgs, unstable, nur, utils, nixos-wsl, home-manager, ... }@inputs: {
# This repo's overlay plus any other overlays you use # This repo's overlay plus any other overlays you use
# If you want to use packages from flakes that are not nixpkgs (such as NUR), add their overlays here. # If you want to use packages from flakes that are not nixpkgs (such as NUR), add their overlays here.\
overlays = import ./overlays // { overlays = {
# Third party overlays here default = import ./overlays inputs;
}; };
overlaysModule = { overlaysModule = {
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays; nixpkgs.overlays = [ self.overlays.default ];
}; };
nixosConfigurations = { nixosConfigurations = {
loft = nixpkgs.lib.nixosSystem { loft = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = utils.lib.system.x86_64-linux;
modules = [ modules = [
./modules/common.nix self.overlaysModule
./modules/containers.nix home-manager.nixosModules.home-manager
./modules/common.nix
./modules/containers.nix
./machines/loft/configuration.nix ./machines/loft/configuration.nix
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
kitchen = nixpkgs.lib.nixosSystem { kitchen = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = utils.lib.system.x86_64-linux;
modules = [ modules = [
self.overlaysModule self.overlaysModule
home-manager.nixosModules.home-manager
./modules/common.nix ./modules/common.nix
./modules/containers.nix ./modules/containers.nix
@ -58,8 +63,9 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
# WSL environment
work = inputs.nixpkgs.lib.nixosSystem { work = inputs.nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = utils.lib.system.x86_64-linux;
modules = [ modules = [
self.overlaysModule self.overlaysModule
{ {
@ -86,12 +92,6 @@
stateVersion = "21.05"; stateVersion = "21.05";
configuration = { config, pkgs, ... }: configuration = { config, pkgs, ... }:
{ {
nixpkgs.config = {
allowUnfree = true;
};
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
programs.home-manager.enable = true; programs.home-manager.enable = true;
imports = [ imports = [
@ -107,12 +107,6 @@
stateVersion = "21.05"; stateVersion = "21.05";
configuration = { config, pkgs, ... }: configuration = { config, pkgs, ... }:
{ {
nixpkgs.config = {
allowUnfree = true;
};
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
programs.home-manager.enable = true; programs.home-manager.enable = true;
imports = [ imports = [
@ -121,5 +115,15 @@
}; };
}; };
}; };
}; };
# // utils.lib.eachSystem [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ] (system: {
# nixpkgs = import nixpkgs {
# inherit system;
# overlays = [
# self.overlays.default
# ];
# config.allowUnfree = true;
# };
# });
} }

5
machines/kitchen/configuration.nix
View File

@ -31,6 +31,11 @@
pkgs.gnome.gnome-tweaks pkgs.gnome.gnome-tweaks
]; ];
home-manager = {
users.michael = import ../../user/environments/nixos/home.nix pkgs;
useGlobalPkgs = true;
};
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
# programs.mtr.enable = true; # programs.mtr.enable = true;

7
machines/loft/configuration.nix
View File

@ -29,6 +29,11 @@
networking.hostName = "loft"; # Define your hostname. networking.hostName = "loft"; # Define your hostname.
networking.firewall.enable = false; networking.firewall.enable = false;
home-manager = {
users.michael = import ../../user/environments/nixos/home.nix pkgs;
useGlobalPkgs = true;
};
# Configure network proxy if necessary # Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@ -65,7 +70,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget micro wget micro
google-chrome google-chrome
pkgs.gnome3.gnome-tweaks gnome3.gnome-tweaks
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
]; ];

5
modules/vscode-server.nix
View File

@ -1,6 +1,9 @@
{ {
imports = [ imports = [
(fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master") (fetchTarball {
url = "https://github.com/msteen/nixos-vscode-server/tarball/d2343b5eb47b811856085f3eff4d899a32b2c136";
sha256 = "sha256:1cszfjwshj6imkwip270ln4l1j328aw2zh9vm26wv3asnqlhdrak";
})
]; ];
services.vscode-server.enable = true; services.vscode-server.enable = true;

18
overlays/default.nix
View File

@ -1,3 +1,15 @@
{ { nixpkgs, unstable, ... }:
paperwm = import ./paperwm;
} let
inherit (nixpkgs.lib) composeManyExtensions;
inherit (builtins) attrNames readDir;
overlay-unstable = self: super: {
unstable = unstable.legacyPackages.x86_64-linux;
};
localOverlays = map
(f: import (./default + "/${f}"))
(attrNames (readDir ./default));
in
composeManyExtensions (localOverlays ++ [
overlay-unstable
])

8
overlays/paperwm/default.nix → overlays/default/paperwm.nix
View File

@ -1,12 +1,12 @@
self: super: { self: super: {
gnomeExtensions = super.gnomeExtensions // { gnomeExtensions = super.gnomeExtensions // {
paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: { paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: {
version = "41.0"; version = "42.0";
src = super.fetchFromGitHub { src = super.fetchFromGitHub {
owner = "PaperWM-community"; owner = "ccope";
repo = "PaperWM"; repo = "PaperWM";
rev = "b66aaf13e8f4cdf0e2f9078fb3e75703535b822c"; rev = "1e9004dc2cd1416cde86585056053853a8b86817";
sha256 = "sha256-6AUUu63oWxRw9Wpxe0f7xvt7iilvQfhpAB8SYG4yP8Q="; sha256 = "sha256-ejyWIa4HX1lEIHc9qax8jgrgi992W6rkTK60FGzKI/E=";
}; };
}); });
}; };

2
user/modules/dev.nix
View File

@ -10,5 +10,7 @@
azure-cli azure-cli
kubectl kubectl
kubernetes-helm kubernetes-helm
# Nix
rnix-lsp
]; ];
} }

4
user/modules/fonts.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, libs, ... }: { config, pkgs, lib, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; }) (nerdfonts.override { fonts = [ "FiraCode" ]; })
@ -6,5 +6,5 @@
inter inter
]; ];
fonts.fontconfig.enable = true; # fonts.fontconfig.enable = true;
} }

4
user/modules/git.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, libs, ... }: { config, pkgs, lib, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
git-lfs git-lfs
@ -10,7 +10,7 @@
userEmail = "michaelhthomas@outlook.com"; userEmail = "michaelhthomas@outlook.com";
userName = "Michael Thomas"; userName = "Michael Thomas";
extraConfig = { extraConfig = {
credential.helper = "store"; credential.helper = lib.mkDefault "store";
pull.rebase = "false"; pull.rebase = "false";
init.defaultBranch = "main"; init.defaultBranch = "main";
}; };

2
user/modules/gnome.nix
View File

@ -4,7 +4,7 @@
gnomeExtensions.caffeine gnomeExtensions.caffeine
gnomeExtensions.paperwm gnomeExtensions.paperwm
gnomeExtensions.cleaner-overview gnomeExtensions.cleaner-overview
gnomeExtensions.vertical-overview unstable.gnomeExtensions.vertical-overview
gnomeExtensions.disable-workspace-switch-animation-for-gnome-40 gnomeExtensions.disable-workspace-switch-animation-for-gnome-40
]; ];