From a43d37b3f4f89e237fc1386d7585d30eac198334 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Fri, 19 Jan 2024 08:46:46 -0500 Subject: [PATCH 1/3] move from unstable to 23.11 --- flake.lock | 8 ++++---- flake.nix | 2 +- modules/nixos-common.nix | 3 +++ users/tacocat/home.nix | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index db61286..2626fcb 100644 --- a/flake.lock +++ b/flake.lock @@ -195,16 +195,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1705458851, + "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index ebab468..b71648e 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; helix.url = "github:helix-editor/helix/master"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/nixos-common.nix b/modules/nixos-common.nix index 8caac2d..40e4de1 100644 --- a/modules/nixos-common.nix +++ b/modules/nixos-common.nix @@ -102,6 +102,9 @@ }; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ + "electron-25.9.0" + ]; programs.nix-index.enable = true; programs.command-not-found.enable = false; diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index af0f5ed..f503f48 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -12,7 +12,7 @@ home = { username = "tacocat"; homeDirectory = "/home/tacocat"; - stateVersion = "24.05"; + stateVersion = "23.11"; sessionVariables = { EDITOR = "hx"; BAT_THEME = "ansi"; From a837266f6cfe09804eb5a2b8dbfd290616303588 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Mon, 22 Jan 2024 12:18:45 -0500 Subject: [PATCH 2/3] Revert "move from unstable to 23.11" This reverts commit a43d37b3f4f89e237fc1386d7585d30eac198334. --- flake.lock | 8 ++++---- flake.nix | 2 +- modules/nixos-common.nix | 3 --- users/tacocat/home.nix | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2626fcb..db61286 100644 --- a/flake.lock +++ b/flake.lock @@ -195,16 +195,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705458851, - "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", + "lastModified": 1705316053, + "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bf65f17d8070a0a490daf5f1c784b87ee73982c", + "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b71648e..ebab468 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; helix.url = "github:helix-editor/helix/master"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/nixos-common.nix b/modules/nixos-common.nix index 40e4de1..8caac2d 100644 --- a/modules/nixos-common.nix +++ b/modules/nixos-common.nix @@ -102,9 +102,6 @@ }; nixpkgs.config.allowUnfree = true; - nixpkgs.config.permittedInsecurePackages = [ - "electron-25.9.0" - ]; programs.nix-index.enable = true; programs.command-not-found.enable = false; diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index f503f48..af0f5ed 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -12,7 +12,7 @@ home = { username = "tacocat"; homeDirectory = "/home/tacocat"; - stateVersion = "23.11"; + stateVersion = "24.05"; sessionVariables = { EDITOR = "hx"; BAT_THEME = "ansi"; From d831d88b6ad5729524034125eda548363a61569a Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Mon, 22 Jan 2024 12:24:41 -0500 Subject: [PATCH 3/3] updated flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index db61286..d36ffc0 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1705516845, - "narHash": "sha256-HNjBxE+amOkV8cB469jKBosOXQ8pDTOR5dLxwxJwfYo=", + "lastModified": 1705932380, + "narHash": "sha256-gRimWDhrO7tNSc8XKivA9AFEP+nTOUbqpOd5WH+qtKw=", "owner": "helix-editor", "repo": "helix", - "rev": "af8e524a7d06253fa854bf8954f64312e11d0ea0", + "rev": "f5f08becef0c27f183a7772f6ec6f5442eca2bab", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1705535278, - "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", + "lastModified": 1705879479, + "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", + "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nur": { "locked": { - "lastModified": 1705539966, - "narHash": "sha256-RkNylawOa36vNRfmJpTcOHZ5g2drQ1s1zTqaGzNMd/o=", + "lastModified": 1705939891, + "narHash": "sha256-a6zelyVE1Vh0jDR4EI88vdM1NHl7yenHyI041L+xkZk=", "owner": "nix-community", "repo": "nur", - "rev": "3c773fa3b438b5b06261f69167b609543caa8701", + "rev": "2482e298332a435100483a35e17d50bcbd9a5325", "type": "github" }, "original": {