dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-08-06 11:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use unstable for all the things

Browse Source
This commit is contained in:
Dave Gallant
2021-01-31 22:08:18 -05:00
parent 22bda76f84
commit d7e10ddd57
7 changed files with 71 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
flake.lock generated
View File

@@ -7,16 +7,15 @@
]
},
"locked": {
"lastModified": 1611323638,
"narHash": "sha256-+7wm2RH82NYTZjzl0Nw+8E4yyXqVp/6xPdPWHAQXlt8=",
"lastModified": 1612092990,
"narHash": "sha256-URLpFNVqrZ/Hectz04KXbtfSCW3muw8V08yKpCmoT4Y=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "91bd34620d73340be03642279ee0d1c64110ee6c",
"rev": "df7d81b0b322c793f1b0e99f7a1e14d91b5312fb",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-20.09",
"repo": "home-manager",
"type": "github"
}
@@ -38,37 +37,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1611910458,
"narHash": "sha256-//j54S14v9lp3YKizS1WZW3WKwLjGTzvwhHfUAaRBPQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6e7f25001fe6874f7ae271891f709bbf50a22c45",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-20.09",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1612059891,
"narHash": "sha256-ltJop0q6WH0S8st4ZQd7tOVlyDJSIei+CD7tJBbIJlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "27da11972d3fd9353f81e94a6549e8a0da40f45d",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1611575689,
"narHash": "sha256-z2rNP3zdVnGxp9iV2Rbn0/LLKhk47DZQKxDkpYFLI7M=",
@@ -88,9 +56,7 @@
"inputs": {
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable"
"nixpkgs": "nixpkgs"
}
}
},

98
flake.nix
View File

@@ -1,67 +1,59 @@
{
inputs = {
home-manager = {
url = "github:nix-community/home-manager/release-20.09";
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "/nixpkgs";
};
nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09";
nixpkgs-master.url = "github:NixOS/nixpkgs";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
};
outputs = { self, home-manager, nixpkgs, nixpkgs-master, nixpkgs-unstable
, nixos-hardware }: {
nixosConfigurations = let
defaultModules = [
home-manager.nixosModules.home-manager
./modules/g810-led.nix
./main/fonts.nix
./main/general.nix
./main/kernel.nix
./main/packages.nix
./main/printing.nix
outputs = { self, home-manager, nixpkgs, nixos-hardware }: {
nixosConfigurations = let
defaultModules = [
home-manager.nixosModules.home-manager
./modules/g810-led.nix
./main/fonts.nix
./main/general.nix
./main/kernel.nix
./main/packages.nix
./main/printing.nix
({ config, lib, lib', ... }: {
config = {
_module.args = {
lib' = lib // import ./lib { inherit config lib; };
master = lib'.pkgsImport nixpkgs-master;
unstable = lib'.pkgsImport nixpkgs-unstable;
};
nix.registry = {
nixpkgs.flake = nixpkgs;
nixpkgs-unstable.flake = nixpkgs-unstable;
};
nixpkgs.overlays = [ (import ./overlays) ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [ ./home/default.nix ];
};
({ config, lib, lib', ... }: {
config = {
_module.args = {
lib' = lib // import ./lib { inherit config lib; };
};
})
];
in {
hephaestus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./machines/hephaestus/configuration.nix
./machines/hephaestus/hardware.nix
] ++ defaultModules;
};
hermes = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
nixos-hardware.nixosModules.lenovo-thinkpad-t480s
./machines/hermes/configuration.nix
./machines/hermes/hardware.nix
] ++ defaultModules;
};
nix.registry = { nixpkgs.flake = nixpkgs; };
nixpkgs.overlays = [ (import ./overlays) ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.dave.imports = [ ./home/default.nix ];
};
};
})
];
in {
hephaestus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./machines/hephaestus/configuration.nix
./machines/hephaestus/hardware.nix
] ++ defaultModules;
};
hermes = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
nixos-hardware.nixosModules.lenovo-thinkpad-t480s
./machines/hermes/configuration.nix
./machines/hermes/hardware.nix
] ++ defaultModules;
};
};
};
}

2
home/default.nix
View File

@@ -112,7 +112,6 @@
initExtra = ''
export PATH=$PATH:~/.cargo/bin
export PATH=$PATH:~/.local/bin
export PATH=$PATH:~/.npm-packages/bin
export PATH=$PATH:~/go/bin
export PAGER=less
@@ -366,6 +365,7 @@
xclip
]);
};
};
home.file.".emacs.d/init.el".source = ./init.el;

18
home/init.el
View File

@@ -1,19 +1,30 @@
;; Enable Mouse
(xterm-mouse-mode 1)
(xterm-mouse-mode)
;; Enable xclip
(require 'xclip)
(define-globalized-minor-mode global-xclip-mode
xclip-mode xclip-mode)
(global-xclip-mode 1)
;; Set up fonts early.
(set-face-attribute 'default
nil
:height 80
:family "Fira Code Mono")
(set-face-attribute 'variable-pitch
nil
:family "Fira CodeSans")
;; Fix clipboard
(setq x-select-enable-clipboard t)
(setq select-enable-clipboard t)
;; Enable Line Numbers
(global-display-line-numbers-mode 1)
;; Disable lock files
(setq create-lockfiles nil)
;; Enable Evil
(require 'evil)
(evil-mode 1)
@@ -73,6 +84,7 @@
;; Enable Flycheck
(global-flycheck-mode)
(setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc))
;; An easier way to toggle comments
(evil-commentary-mode)

7
main/fonts.nix
View File

@@ -9,12 +9,9 @@
fira-mono
font-awesome
google-fonts
liberation_ttf # Free replacement for MS Fonts.
noto-fonts
liberation_ttf
noto-fonts
noto-fonts-cjk
noto-fonts-cjk
noto-fonts-emoji
noto-fonts-emoji
noto-fonts-extra
];
@@ -23,7 +20,7 @@
fonts.fontconfig.defaultFonts = {
sansSerif = [ "Noto Sans" ];
serif = [ "Noto Serif" ];
monospace = [ "MesloLGS Nerd Font" "Noto Sans Mono" ];
monospace = [ "Noto Sans Mono" ];
emoji = [ "Noto Color Emoji" ];
};
}

4
main/kernel.nix
View File

@@ -1,8 +1,8 @@
{ unstable, ... }:
{ pkgs, ... }:
{
# Use the latest kernel
boot.kernelPackages = unstable.linuxPackages_latest;
boot.kernelPackages = pkgs.linuxPackages_latest;
# Enable support for additional filesystems
boot.supportedFilesystems = [ "ntfs" ];

4
main/packages.nix
View File

@@ -1,8 +1,8 @@
{ config, lib, pkgs, unstable, ... }:
{ config, lib, pkgs, ... }:
{
# System-wide packages to install.
environment.systemPackages = with unstable;
environment.systemPackages = with pkgs;
let
common = [
# utils