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

Compare commits

base: michael:dcf01cce81419168bb5a1ba4194b8afc281fd6f5
Branches Tags
michael:main
..
compare: michael:0e8ec4cd07358af391f41eaccbb5d4c5e4306d98
Branches Tags
michael:main

No commits in common. "dcf01cce81419168bb5a1ba4194b8afc281fd6f5" and "0e8ec4cd07358af391f41eaccbb5d4c5e4306d98" have entirely different histories.
dcf01cce81 ... 0e8ec4cd07

11 changed files with 64 additions and 108 deletions
Show Stats Expand all files Collapse all files

54
flake.lock generated
View File

@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1655723343, "lastModified": 1654591300,
"narHash": "sha256-J95qdF7m30dEioJZE8fsmaOusqIp57SMJyG4U/ZKfJk=", "narHash": "sha256-53a6fimkMTc1DqnzdEWFHbaOT1xlMgeOJaD2/IGO22k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "e178b6df72d79324a8446cd175d9d091223585ae", "rev": "4de4d6acb7fc868677380496b62a5e51890fc331",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,26 +76,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1655456688, "lastModified": 1654442937,
"narHash": "sha256-j2trI5gv2fnHdfUQFBy957avCPxxzCqE8R+TOYHPSRE=", "narHash": "sha256-dYJ79gt85hwIbPlX52eAwnkYzMexLyNRmRcTRpMn+Gw=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d17a56d90ecbd1b8fc908d49598fb854ef188461", "rev": "ca2629644d4a5098004e20cb9ca179345f2acd8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "nixos-22.05", "ref": "nixos-22.05",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1655739339, "lastModified": 1654593979,
"narHash": "sha256-ykV5RQgltIJl5EXbGdndf6IcncfCP8RnyH57TyKFazE=", "narHash": "sha256-iDvyU5vs7IoPBpxwhNAI/J3llDsmtzH1xYqvCGvzCww=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "0cadcae82c23de1ec4b4a5bbe1e2f75e59752317", "rev": "47044837d4ebcaa37e699d92d893a32d4e301852",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,37 +111,22 @@
"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": 1655567057, "lastModified": 1654230545,
"narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e0a42267f73ea52adc061a64650fddc59906fc99", "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
}
},
"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,12 +2,10 @@
description = "Michael Thomas's NixOS configuration"; description = "Michael Thomas's NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
unstable.url = "nixpkgs/nixos-unstable"; unstable.url = "github:nixos/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 = {
@ -23,38 +21,35 @@
}; };
}; };
outputs = { self, nixpkgs, unstable, nur, utils, nixos-wsl, home-manager, ... }@inputs: { outputs = { self, nixpkgs, unstable, nur, 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 = { overlays = import ./overlays // {
default = import ./overlays inputs; # Third party overlays here
}; };
overlaysModule = { overlaysModule = {
nixpkgs.overlays = [ self.overlays.default ]; nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
}; };
nixosConfigurations = { nixosConfigurations = {
loft = nixpkgs.lib.nixosSystem { loft = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux; system = "x86_64-linux";
modules = [ modules = [
self.overlaysModule ./modules/common.nix
home-manager.nixosModules.home-manager ./modules/containers.nix
./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 = utils.lib.system.x86_64-linux; 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
@ -63,9 +58,8 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
# WSL environment
work = inputs.nixpkgs.lib.nixosSystem { work = inputs.nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux; system = "x86_64-linux";
modules = [ modules = [
self.overlaysModule self.overlaysModule
{ {
@ -92,6 +86,12 @@
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,6 +107,12 @@
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 = [
@ -115,15 +121,5 @@
}; };
}; };
}; };
}; };
# // 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,11 +31,6 @@
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,11 +29,6 @@
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";
@ -70,7 +65,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget micro wget micro
google-chrome google-chrome
gnome3.gnome-tweaks pkgs.gnome3.gnome-tweaks
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
]; ];

5
modules/vscode-server.nix
View File

@ -1,9 +1,6 @@
{ {
imports = [ imports = [
(fetchTarball { (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
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,15 +1,3 @@
{ 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/default/paperwm.nix → overlays/paperwm/default.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 = "42.0"; version = "41.0";
src = super.fetchFromGitHub { src = super.fetchFromGitHub {
owner = "ccope"; owner = "PaperWM-community";
repo = "PaperWM"; repo = "PaperWM";
rev = "1e9004dc2cd1416cde86585056053853a8b86817"; rev = "b66aaf13e8f4cdf0e2f9078fb3e75703535b822c";
sha256 = "sha256-ejyWIa4HX1lEIHc9qax8jgrgi992W6rkTK60FGzKI/E="; sha256 = "sha256-6AUUu63oWxRw9Wpxe0f7xvt7iilvQfhpAB8SYG4yP8Q=";
}; };
}); });
}; };

1
user/modules/dev.nix
View File

@ -4,6 +4,5 @@
nodejs nodejs
nodePackages.yarn nodePackages.yarn
php php
rnix-lsp
]; ];
} }

4
user/modules/fonts.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, libs, ... }:
{ {
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, lib, ... }: { config, pkgs, libs, ... }:
{ {
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 = lib.mkDefault "store"; credential.helper = "store";
pull.rebase = "false"; pull.rebase = "false";
}; };
}; };

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
unstable.gnomeExtensions.vertical-overview gnomeExtensions.vertical-overview
gnomeExtensions.disable-workspace-switch-animation-for-gnome-40 gnomeExtensions.disable-workspace-switch-animation-for-gnome-40
]; ];