jakalx/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updote to NixOS 21.11

Browse source
This commit is contained in:
Alexander Kobjolke 2022-01-08 18:42:47 +01:00
parent 46d404d109
commit 5888a0e26f
4 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

60
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1638837456, "lastModified": 1641576265,
"narHash": "sha256-WHLOxthAGx/wXw3QUa/lFE3mr6cQtnXfFYZ0DNyYwt4=", "narHash": "sha256-G4W39k5hdu2kS13pi/RhyTOySAo7rmrs7yMUZRH0OZI=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "57806bf7e340f4cae705c91748d4fdf8519293a9", "rev": "08b9c96878b2f9974fc8bde048273265ad632357",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,11 +36,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1629481132, "lastModified": 1638122382,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "997f7efcb746a9c140ce1f13c72263189225f482", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,16 +56,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1638281721, "lastModified": 1639871969,
"narHash": "sha256-d3vAVFG6zov9NwjSuYntBiD+I5KjJLwX09c7uAzbONI=", "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7329ffc6e911106494183557fc249180d5422929", "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.05", "ref": "release-21.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -98,18 +98,33 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_2": { "nixpkgs-21_11": {
"locked": { "locked": {
"lastModified": 1638798756, "lastModified": 1638371214,
"narHash": "sha256-VFuVwQ4YjPNnclRh6vcy5pR0AgPxlGeanVYBLVCr9ZI=", "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a8751d694b46340072d95409804f59b98326f44", "rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-21.11",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1641643358,
"narHash": "sha256-9NfLuqmbml3qr43NkLrJftzHmqvSARuJ8feapM6Ern8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a0ff8e080633b00f66059f29d1d1e97b6bb2976",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-21.05-small", "ref": "nixos-21.11-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -130,14 +145,15 @@
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-21_05": "nixpkgs-21_05", "nixpkgs-21_05": "nixpkgs-21_05",
"nixpkgs-21_11": "nixpkgs-21_11",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1638726801, "lastModified": 1638911354,
"narHash": "sha256-qQz7YjJdV3F/vO/KUz6qo6+6TCILHb1mHSQqQsQjhm4=", "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "f3d967f8308f0f617597ab0b96bfec3fc1aeb325", "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -166,16 +182,16 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1632420560, "lastModified": 1638172912,
"narHash": "sha256-8Tsa4Hp/CHCA6J8/E7EODhp75z5N1NBhFiOb3lBv/tI=", "narHash": "sha256-jxhQGNEsZTdop/Br3JPS+xmBf6t9cIWRzVZFxbT76Rw=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "4b1bcafcfcd78bd36ceabfe3872822ba5c7fcbe8", "rev": "166d6ebd9f0de03afc98060ac92cba9c71cfe550",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"ref": "v1.3.0", "ref": "v1.3.1",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }

6
flake.nix
View file

@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11-small";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.0"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
hm = { hm = {
url = "github:nix-community/home-manager/release-21.05"; url = "github:nix-community/home-manager/release-21.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

17
home/cli.nix
View file

@ -13,7 +13,7 @@
username = "alex"; username = "alex";
homeDirectory = "/home/alex"; homeDirectory = "/home/alex";
stateVersion = "21.05"; stateVersion = "21.05";
sessionPath = [ "$HOME/.local/bin" ]; sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ];
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -68,12 +68,25 @@
text = '' text = ''
set -g default-terminal "tmux-256color" set -g default-terminal "tmux-256color"
set -g prefix C-z set -g prefix C-z
# do not wait for a manually entered escape sequence, just forward it immediately
set -g escape-time 0
bind-key C-z send-prefix bind-key C-z send-prefix
set -g renumber-windows on set -g renumber-windows on
''; '';
}; };
programs = { programs = {
zsh = {
enable = true;
enableAutosuggestions = true;
# enableSyntaxHighlighting = true;
oh-my-zsh = {
enable = true;
plugins = [ "git" ];
theme = "simple";
};
};
# better cat # better cat
bat.enable = true; bat.enable = true;
@ -89,7 +102,7 @@
gh = { gh = {
enable = true; enable = true;
gitProtocol = "ssh"; settings.git_protocol = "ssh";
}; };
git = { git = {

3
hosts/thrall/default.nix
View file

@ -11,7 +11,7 @@
nix.package = pkgs.nixUnstable; nix.package = pkgs.nixUnstable;
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes ca-derivations ca-references experimental-features = nix-command flakes ca-derivations
''; '';
#nix.registry.nixpkgs.flake = nixpkgs; #nix.registry.nixpkgs.flake = nixpkgs;
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
@ -114,6 +114,7 @@
users.users.alex = { users.users.alex = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
shell = pkgs.zsh;
}; };
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run: