From d0c2f611770c3c95fbd51e4deeda3327f86c84cc Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 27 Nov 2024 23:48:18 +0100 Subject: [PATCH 1/2] chore: Update flake inputs --- flake.lock | 76 +++++++++++++++--------------------------------------- 1 file changed, 21 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 14755c7..bcfe083 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1730135292, - "narHash": "sha256-QUU1P8x42b8moaUsxJkamfcRXdyNjIq79ZThzT3CVUA=", + "lastModified": 1732645828, + "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", "owner": "nix-community", "repo": "disko", - "rev": "0e55423bf8c241cf18676a8b8424c7eadd170ffc", + "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", "type": "github" }, "original": { @@ -83,18 +83,17 @@ }, "emacs": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730132590, - "narHash": "sha256-5XCF16oq/NBmx/2cJ8mK1kv+kOKNULcNWP0MsgMraq8=", + "lastModified": 1732724585, + "narHash": "sha256-pO5sNOYN1FHUw1/rUWamL+A3cktUG5ZOo3F3yMUCfMI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "64c6af10947cd17201570726eba26046e95ed58b", + "rev": "96e0bac0682868c890d4d36168024853e8dee174", "type": "github" }, "original": { @@ -135,24 +134,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -202,11 +183,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -287,11 +268,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -350,11 +331,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1732632634, + "narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30", "type": "github" }, "original": { @@ -366,11 +347,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -453,11 +434,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -516,21 +497,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1659877975, From c30db4076b7821f5b33c3bde0cc8da2fab5fe58e Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Wed, 27 Nov 2024 23:48:35 +0100 Subject: [PATCH 2/2] igor: Update configuration --- hosts/igor/default.nix | 67 ++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/hosts/igor/default.nix b/hosts/igor/default.nix index 02d17e9..31ab701 100644 --- a/hosts/igor/default.nix +++ b/hosts/igor/default.nix @@ -1,4 +1,8 @@ -{ config, inputs, lib, pkgs, ... }: +{ + inputs, + pkgs, + ... +}: { imports = [ @@ -12,54 +16,61 @@ ./disko-config.nix ]; - networking = let extIface = "ens3"; - in { - hostName = "igor"; - domain = "failco.de"; - wireless.enable = false; - useDHCP = false; - enableIPv6 = false; - interfaces.${extIface} = { - ipv4.addresses = [{ - address = "192.168.0.2"; - prefixLength = 24; - }]; - }; - defaultGateway = "192.168.0.1"; - nameservers = [ "1.1.1.1" "8.8.8.8" ]; - firewall = { - allowedTCPPorts = [ 22 80 443 ]; - allowedUDPPorts = [ ]; - }; - }; + config.networking = + let + extIface = "ens3"; + in + { + hostName = "igor"; + domain = "failco.de"; + wireless.enable = false; + useDHCP = false; + enableIPv6 = false; + interfaces.${extIface} = { + ipv4.addresses = [ + { + address = "192.168.0.2"; + prefixLength = 24; + } + ]; + }; + defaultGateway = "192.168.0.1"; + nameservers = [ + "192.168.0.1" + "1.1.1.1" + "8.8.8.8" + ]; - security.sudo = { + firewall.enable = true; + }; + + config.security.sudo = { enable = true; execWheelOnly = true; }; # Select internationalization properties. - i18n.defaultLocale = "en_US.UTF-8"; - console = { + config.i18n.defaultLocale = "en_US.UTF-8"; + config.console = { font = "Lat2-Terminus16"; keyMap = "dvorak"; }; # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.me = { + config.users.users.alex = { isNormalUser = true; extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. shell = pkgs.zsh; }; - programs.neovim = { + config.programs.neovim = { enable = true; defaultEditor = true; viAlias = true; vimAlias = true; }; - programs.zsh.enable = true; + config.programs.zsh.enable = true; - system.stateVersion = "23.11"; + config.system.stateVersion = "24.05"; }