thehedgehog/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

push for debugging

Browse source
This commit is contained in:
Mr Hedgehog 2022-02-03 06:46:44 -05:00
parent 3dbaa8326d
commit 7b39960b22
No known key found for this signature in database
GPG key ID: A5F69F6C161FDA7E
9 changed files with 224 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

238
flake.lock
View file

@ -32,11 +32,11 @@
"treefmt": "treefmt" "treefmt": "treefmt"
}, },
"locked": { "locked": {
"lastModified": 1643681595, "lastModified": 1643768181,
"narHash": "sha256-vqb1RU1KlLl3/wYwNVwQIZDgr2Ogz/ZrIzqtsdRBbRc=", "narHash": "sha256-ie+jEu64YmJuEHyaY/4thmctjgR6B4g2muTJx8OBNng=",
"owner": "kamadorueda", "owner": "kamadorueda",
"repo": "alejandra", "repo": "alejandra",
"rev": "2b04b9b11791b9000a3b920e7e0f64d1196a2a2d", "rev": "d479b6b77089269891e1311eaf41f966ecd0beef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,11 +63,11 @@
}, },
"emacs": { "emacs": {
"locked": { "locked": {
"lastModified": 1643712538, "lastModified": 1643826969,
"narHash": "sha256-RkxgK7qom9gbBF6cI3bROI3eSEV8BYPQAr2YlLDSAH8=", "narHash": "sha256-bB7APUXEEG3fijqDMUROdr1Vs0Q8KqPY/EziFLVEVJA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "05bb95f4cdcd14359e6339f0a44b05878aa59481", "rev": "2724a0a09fbb95110980085991cc05fb45ee6c2b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -78,14 +78,8 @@
}, },
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs",
"alejandra", "rust-analyzer-src": "rust-analyzer-src"
"nixpkgs"
],
"rust-analyzer-src": [
"alejandra",
"rustAnalyzer"
]
}, },
"locked": { "locked": {
"lastModified": 1643610217, "lastModified": 1643610217,
@ -106,14 +100,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
"lastModified": 1643696611, "lastModified": 1643782989,
"narHash": "sha256-zzVdkKVjbc1A91XszegenTgLSPkt3gtuOiY7Px5Lk6Q=", "narHash": "sha256-7get5nUAUiZ/9CYW8bbrLhA5LDORdFeCTpKesOyE98g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "06e7c3fc9cdb2f6a3bfd2886b0a2c3aedf3529c7", "rev": "bc649b429aa1fabce3ec7ca476ef377c86647797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -124,11 +118,8 @@
}, },
"fenix_3": { "fenix_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_5",
"statix", "rust-analyzer-src": "rust-analyzer-src_3"
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
"lastModified": 1642141613, "lastModified": 1642141613,
@ -176,6 +167,21 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": { "locked": {
"lastModified": 1629481132, "lastModified": 1629481132,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
@ -223,10 +229,7 @@
}, },
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_6"
"statix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1635165013, "lastModified": 1635165013,
@ -249,11 +252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1643579427, "lastModified": 1643837728,
"narHash": "sha256-tV4M4+Aqd/3ZjEz1Q07j89KIlkt1oFH34RzpBkUeO/0=", "narHash": "sha256-iW/5eMRQmzdctv2dAUlIaZnVWwcmaznNajS+ft1MXHg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a52aed72c84a2a10102a92397339fa01fc0fe9cf", "rev": "9d369c75ce2fdeb296ad42bcdc8c1a523c494550",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +310,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1643703228, "lastModified": 1643789594,
"narHash": "sha256-nMUqkqTav6H9GFS/hut1QVTk0uecfpqH2OCbvG2fcyc=", "narHash": "sha256-mxEkC78afrg1KtRhlpdJ5mPLRFFCC+1LcSGpwUYgEBA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "1c8ac6e3b1c73b305977b30afcd81d8b0fdc3b71", "rev": "d60554a6e96d9ba2da46cd91a4e67c06912f8da4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,19 +325,16 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": "nixpkgs_3"
"neovim",
"nixpkgs"
]
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1643700928, "lastModified": 1643767869,
"narHash": "sha256-CUkK0BY5HTwJjzluG/tkzgt91Zi84m4AT+dTYW+hTsc=", "narHash": "sha256-Oyno3HHIKfOdb6Ij6lRxOBp0urPhXBskh/I5l5O5GSM=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "a562b5771ea91becd0a469378ec852feaf50d2d0", "rev": "2559359035b7b0dd6f94fef9573e8133176c1553",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +346,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1643720269, "lastModified": 1643830986,
"narHash": "sha256-q5YkgnKMbnXZtksogAy5ebGsVEsiWr+DzaMWGRZkOdQ=", "narHash": "sha256-nkUU6QI7pfh/d0/u+yStJAcnLPp5jZ/Q0EArXYONtqk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d1ec053bf51bcbd3d194ce163c0ce2c2a96ed99b", "rev": "da911ccd4c4a904dd3c4911caa3e8413e8c7ac4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,11 +362,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1641965797, "lastModified": 1643792182,
"narHash": "sha256-AfxfIzAZbt9aAzpVBn0Bwhd/M4Wix7G91kEjm9H6FPo=", "narHash": "sha256-GVWJfEnSv29CandD39b5z+iveiKC6Kvyo63mebquG6I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "87a35a0d58f546dc23f37b4f6af575d0e4be6a7a", "rev": "57c7dfde9d1de3a6f35dc59447990cde4cd3e466",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,6 +376,54 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1643524588,
"narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1643472818,
"narHash": "sha256-qzVPxKDUubYIxKRSuDl/JgzXWSmGvUVYny9SxFMfPJM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7f65e4abd5ecaad12d2d26e4380d1a7d8edafea7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1643524588,
"narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1643472818, "lastModified": 1643472818,
"narHash": "sha256-qzVPxKDUubYIxKRSuDl/JgzXWSmGvUVYny9SxFMfPJM=", "narHash": "sha256-qzVPxKDUubYIxKRSuDl/JgzXWSmGvUVYny9SxFMfPJM=",
@ -391,49 +439,62 @@
"type": "github" "type": "github"
} }
}, },
"nur": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1643712485, "lastModified": 1643524588,
"narHash": "sha256-Vd/dX23gtAdiTrBcC2Tjg/WD+m+mZiWzN4vL+5g5FCQ=", "narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=",
"owner": "nix-community", "owner": "nixos",
"repo": "NUR", "repo": "nixpkgs",
"rev": "93c47b0b5f3547ebab375bc69091b2a2d14374da", "rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nixos",
"repo": "NUR", "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": {
"locked": {
"lastModified": 1643472818,
"narHash": "sha256-qzVPxKDUubYIxKRSuDl/JgzXWSmGvUVYny9SxFMfPJM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7f65e4abd5ecaad12d2d26e4380d1a7d8edafea7",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"alejandra": "alejandra", "alejandra": "alejandra",
"emacs": "emacs", "emacs": "emacs",
"fenix": "fenix_2", "fenix": "fenix_2",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"naersk": "naersk", "naersk": "naersk",
"neovim": "neovim", "neovim": "neovim",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_4",
"nur": "nur",
"statix": "statix", "statix": "statix",
"utils": "utils",
"wayland": "wayland" "wayland": "wayland"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1643645003, "lastModified": 1643802160,
"narHash": "sha256-uz+MXBcGoIqzc6acGB7GjJQsTWKr341+fjjv+pQR8N8=", "narHash": "sha256-m3V0VU1M8k0NBYoLaQZFVZaejtfWn2kLLXxZNnHuujk=",
"owner": "rust-analyzer", "owner": "rust-analyzer",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "4800c05a206eb156617b76fdb30af0b6c2c0fb26", "rev": "9cb6e3a190f7781cb7e243837b47e6889d204d52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,6 +505,23 @@
} }
}, },
"rust-analyzer-src_2": { "rust-analyzer-src_2": {
"flake": false,
"locked": {
"lastModified": 1643756728,
"narHash": "sha256-46tA2m137jpmhDjjOJLaAi8z44zra6qYMTZgKpbyqHM=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "34138379b5945616e51b3822769628b252c7a4f5",
"type": "github"
},
"original": {
"owner": "rust-analyzer",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-analyzer-src_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1642101527, "lastModified": 1642101527,
@ -500,14 +578,8 @@
}, },
"treefmt": { "treefmt": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils",
"alejandra", "nixpkgs": "nixpkgs_2"
"flakeUtils"
],
"nixpkgs": [
"alejandra",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1640364438, "lastModified": 1640364438,
@ -523,26 +595,6 @@
"type": "github" "type": "github"
} }
}, },
"utils": {
"inputs": {
"flake-utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1639385028,
"narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "be1be083af014720c14f3b574f57b6173b4915d0",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
},
"wayland": { "wayland": {
"inputs": { "inputs": {
"cachix": "cachix", "cachix": "cachix",
@ -551,11 +603,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1643468877, "lastModified": 1643809705,
"narHash": "sha256-qjPCoen3+3ysP1R0AreGEdPTOS2Z4F9Wk05b/lVSK5Y=", "narHash": "sha256-FfVKi1tgKwlrjGh2Fxu3eXRQpHeMfrEbROMWMSgzHUY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "1be0382761e59978d46c4a2a6fed0193f474751f", "rev": "a6946d17f2d2c13bb30262e21f842e487f0591be",
"type": "github" "type": "github"
}, },
"original": { "original": {

122
flake.nix
View file

@ -24,99 +24,87 @@
naersk.inputs.nixpkgs.follows = "nixpkgs"; naersk.inputs.nixpkgs.follows = "nixpkgs";
neovim.url = "github:nix-community/neovim-nightly-overlay"; neovim.url = "github:nix-community/neovim-nightly-overlay";
neovim.inputs.nixpkgs.follows = "nixpkgs"; neovim.inputs.nixpkgs.follows = "nixpkgs";
nur.url = "github:nix-community/NUR"; # nur.url = "github:nix-community/NUR";
nur.inputs.nixpkgs.follows = "nixpkgs"; # nur.inputs.nixpkgs.follows = "nixpkgs";
# poetry2nix.url = "github:nix-community/poetry2nix"; # poetry2nix.url = "github:nix-community/poetry2nix";
# poetry2nix.inputs.nixpkgs.follows = "nixpkgs"; # poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
# poetry2nix.inputs.flake-utils.follows = "flake-utils";
statix.url = "github:nerdypepper/statix"; statix.url = "github:nerdypepper/statix";
statix.inputs.nixpkgs.follows = "nixpkgs"; statix.inputs.nixpkgs.follows = "nixpkgs";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
utils.inputs.nixpkgs.follows = "nixpkgs";
utils.inputs.flake-utils.follows = "flake-utils";
# vim-plugins.url = "github:m15a/nixpkgs-vim-extra-plugins"; # vim-plugins.url = "github:m15a/nixpkgs-vim-extra-plugins";
# vim-plugins.inputs.nixpkgs.follows = "nixpkgs"; # vim-plugins.inputs.nixpkgs.follows = "nixpkgs";
# vim-plugins.inputs.flake-utils.follows = "flake-utils";
wayland.url = "github:nix-community/nixpkgs-wayland"; wayland.url = "github:nix-community/nixpkgs-wayland";
wayland.inputs.nixpkgs.follows = "nixpkgs"; wayland.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = outputs =
inputs @
{ self { self
, nixos , nixos
, latest
, nixpkgs
, nixos-hardware , nixos-hardware
, agenix , agenix
, alejandra , alejandra
, emacs , emacs
, fenix , fenix
, flake-utils
, home , home
, neovim , neovim
, nur # , nur
, utils # , poetry2nix
, statix , statix
# , vim-plugins
, wayland , wayland
, ... , ...
} }:
@ inputs: let
utils.lib.mkFlake system = "x86_64-linux";
{ pkgs = import nixpkgs {
inherit self inputs; inherit system;
channelsConfig = { allowUnfree = true; }; # system = "x86_64-linux";
supportedSystems = [ "x86_64-linux" ]; config.allowUnfree = true;
sharedOverlays = [ overlays = [
# ./pkgs/default.nix
agenix.overlay agenix.overlay
emacs.overlay emacs.overlay
fenix.overlay fenix.overlay
neovim.overlay neovim.overlay
nur.overlay # (import inputs.nur)
# vim-plugins.overlay # (import inputs.vim-plugins)
]; ];
hostDefaults = {
system = "x86_64-linux";
channelName = "nixpkgs";
modules = [
./modules/hm-system-defaults.nix
./modules/nix-path.nix
home.nixosModules.home-manager
agenix.nixosModules.age
];
};
hosts = {
zaphod = {
modules = [
./hosts/zaphod.nix
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mrhedgehog = import ./home/mrhedgehog.nix;
}
];
specialArgs = inputs;
};
bootstrap = { modules = [ ./hosts/bootstrap.nix ]; };
};
# nixosConfigurations = {
# zaphod = inputs.nixpkgs.lib.nixosSystem {
# system = "x86_64-linux";
# modules = [
# ./hosts/zaphod.nix
# ./modules/hm-system-defaults.nix
# ./modules/nix-path.nix
# home.nixosModules.home-manager
# agenix.nixosModules.age
# {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.mrhedgehog = import ./home/mrhedgehog.nix;
# }
# ];
# };
# };
# homeConfigurations = import ./home/default.nix;
# mrhedgehog = self.homeConfigurations.mrhedgehog.activationPackage;
# defaultPackage.x86_64-linux = self.homeConfigurations.mrhedgehog.activationPackage;
}; };
in
{
nixosConfigurations = {
zaphod = nixpkgs.lib.nixosSystem
{
inherit system;
# system = "x86_64-linux";
specialArgs = { inherit inputs pkgs; };
modules = (
[
./hosts/zaphod.nix
./modules/hm-system-defaults.nix
./modules/nix-path.nix
home.nixosModules.home-manager
agenix.nixosModules.age
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mrhedgehog = import ./home/mrhedgehog.nix {
inherit self pkgs inputs;
};
}
]
);
};
};
homeConfigurations = {
mrhedgehog = inputs.home.lib.homeManagerConfiguration {
# inherit system;
# system = "x86_64-linux";
homeDirectory = "/home/mrhedgehog";
username = "mrhedgehog";
configuration.imports = [ ./home/mrhedgehog.nix { inherit pkgs; } ];
};
};
};
} }

6
home/default.nix
View file

@ -5,14 +5,14 @@
}: }:
{ {
mrhedgehog = mrhedgehog =
(inputs.home.lib.homeManagerConfiguration home.lib.homeManagerConfiguration
{ {
system = "x86_64-linux"; system = "x86_64-linux";
homeDirectory = "/home/mrhedgehog"; homeDirectory = "/home/mrhedgehog";
username = "mrhedgehog"; username = "mrhedgehog";
stateVersion = "22.05";
configuration = { configuration = {
imports = [ ./mrhedgehog.nix ]; imports = [ ./mrhedgehog.nix ];
}; };
}).activationPackage; stateVersion = "22.05";
};
} }

8
home/mrhedgehog.nix
View file

@ -1,9 +1,9 @@
{ pkgs { pkgs
, inputs , inputs
, config
, ... , ...
}: }:
{ {
inherit pkgs;
imports = [ imports = [
./programs/atuin.nix ./programs/atuin.nix
./programs/bat.nix ./programs/bat.nix
@ -20,4 +20,10 @@
./programs/unorganized.nix ./programs/unorganized.nix
./programs/zoxide.nix ./programs/zoxide.nix
]; ];
home = {
homeDirectory = "/home/mrhedgehog";
username = "mrhedgehog";
stateVersion = "22.05";
};
programs.home-manager.enable = true;
} }

2
home/programs/gh.nix
View file

@ -6,7 +6,7 @@
enable = true; enable = true;
enableGitCredentialHelper = true; enableGitCredentialHelper = true;
settings = { settings = {
editor = "nvim"; editor = "${pkgs.neovim}/bin/nvim";
git_protocol = "https"; git_protocol = "https";
browser = "waterfox-g4"; browser = "waterfox-g4";
prompt = "enabled"; prompt = "enabled";

12
home/programs/git.nix
View file

@ -2,16 +2,6 @@
, ... , ...
}: }:
{ {
programs.gh = {
enable = true;
enableGitCredentialHelper = true;
settings = {
editor = "nvim";
git_protocol = "https";
browser = "waterfox-g4";
prompt = "enabled";
};
};
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
@ -49,7 +39,7 @@
options.line-numbers = true; options.line-numbers = true;
}; };
extraConfig = { extraConfig = {
core.editor = "nvim"; core.editor = "${pkgs.neovim}/bin/nvim";
init.defaultBranch = "main"; init.defaultBranch = "main";
pull.rebase = false; pull.rebase = false;
}; };

18
home/programs/home/default.nix
View file

@ -1,13 +1,8 @@
{ config { pkgs
, lib
, pkgs
, ... , ...
}: }:
{ {
home = { home = {
homeDirectory = "/home/mrhedgehog/";
stateVersion = "22.05";
username = "mrhedgehog";
packages = packages =
with pkgs; with pkgs;
[ [
@ -29,8 +24,6 @@
# freetube # freetube
hyperfine hyperfine
josm josm
md-tangle
nvchecker-bin
rnix-lsp rnix-lsp
senpai senpai
shellcheck shellcheck
@ -46,15 +39,14 @@
zulip-term zulip-term
zulip zulip
]; ];
file = { # file = {
".config/senpai/senpai.scfg" = { source = ./config/senpai.scfg; }; # ".config/senpai/senpai.scfg" = { source = ./config/senpai.scfg; };
".config/kanshi/config" = { source = ./config/kanshi.cfg; }; # ".config/kanshi/config" = { source = ./config/kanshi.cfg; };
}; # };
}; };
programs = { programs = {
home-manager = { home-manager = {
enable = true; enable = true;
path = "./home-manager";
}; };
himalaya = { enable = true; }; himalaya = { enable = true; };
}; };

5
hosts/zaphod.nix
View file

@ -1,5 +1,6 @@
{...}: {...}:
{ {
system = "x86_64-linux";
boot = { boot = {
loader = { loader = {
systemd-boot.enable = false; systemd-boot.enable = false;
@ -29,4 +30,8 @@
}; };
}; };
swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
users.extraUsers.mrhedgehog = {
isNormalUser = true;
};
} }

4
users/mrhedgehog/default.nix
View file

@ -1,5 +1,5 @@
{ hmUsers { hmUsers
, pkgs , nixpkgs
, ... , ...
}: }:
{ {
@ -9,7 +9,7 @@
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" ]; extraGroups = [ "wheel" "networkmanager" ];
hashedPassword = "$6$6EtuZhVOJdfI9DYP$1Qnd7R8qdN.E5yE2kDQCNg2zgJ5cIjNBKsIW/qJgb8wcKlUpIoVg/fEKvBkAgCiLyojVG2kzfu4J9LR8rA8a2/"; hashedPassword = "$6$6EtuZhVOJdfI9DYP$1Qnd7R8qdN.E5yE2kDQCNg2zgJ5cIjNBKsIW/qJgb8wcKlUpIoVg/fEKvBkAgCiLyojVG2kzfu4J9LR8rA8a2/";
shell = pkgs.fish; shell = nixpkgs.fish;
openssh = { authorizedKeys = { keyFiles = [ ../../ssh/yubikey.pub ../../ssh/backup.pub ]; }; }; openssh = { authorizedKeys = { keyFiles = [ ../../ssh/yubikey.pub ../../ssh/backup.pub ]; }; };
}; };
} }