From abcf1fbfdc102e1507d64d93e0318267f31a108b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Oct 2024 16:16:09 +0300 Subject: [PATCH 1/5] Switch back to nixos stable. Mirkwood wouldn't boot This reverts commit e4e6e32b7142967139f6300cedf0ffc31310e1d7. --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index c8cd8a0c..cbc5482d 100644 --- a/flake.lock +++ b/flake.lock @@ -23,32 +23,32 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1726592409, + "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 135a0d43..368e0d7c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "FunctionalHacker's NixOS config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nur.url = "github:nix-community/NUR"; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; From 06e6ff5e66204c161664212f2b700dd2064eb7e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Oct 2024 16:16:27 +0300 Subject: [PATCH 2/5] Change home-manager backup extension --- home-manager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager.nix b/home-manager.nix index c91a09d1..48a85899 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -5,7 +5,7 @@ useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { inherit inputs; }; - backupFileExtension = "bak"; + backupFileExtension = "hm-backup"; users.functionalhacker = import ./users/functionalhacker/home.nix; }; From e35cd835986c382b8e7357732482efee9baed20e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Oct 2024 16:17:02 +0300 Subject: [PATCH 3/5] Add gpg and ssh settings (home-manager) --- users/functionalhacker/programs/default.nix | 2 ++ users/functionalhacker/programs/gpg.nix | 13 +++++++ users/functionalhacker/programs/ssh.nix | 20 +++++++++++ users/functionalhacker/pubkey.asc | 38 +++++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 users/functionalhacker/programs/gpg.nix create mode 100644 users/functionalhacker/programs/ssh.nix create mode 100644 users/functionalhacker/pubkey.asc diff --git a/users/functionalhacker/programs/default.nix b/users/functionalhacker/programs/default.nix index 06e18579..2bb46dd4 100644 --- a/users/functionalhacker/programs/default.nix +++ b/users/functionalhacker/programs/default.nix @@ -8,9 +8,11 @@ ./fzf.nix ./git.nix ./gnome.nix + ./gpg.nix ./neovim.nix ./pass.nix ./ripgrep.nix + ./ssh.nix ./zellij.nix ./zsh.nix ]; diff --git a/users/functionalhacker/programs/gpg.nix b/users/functionalhacker/programs/gpg.nix new file mode 100644 index 00000000..a452df24 --- /dev/null +++ b/users/functionalhacker/programs/gpg.nix @@ -0,0 +1,13 @@ +{ ... }: + +{ + programs.gpg = { + enable = true; + publicKeys = [ + { + source = ../pubkey.asc; + trust = 5; + } + ]; + }; +} diff --git a/users/functionalhacker/programs/ssh.nix b/users/functionalhacker/programs/ssh.nix new file mode 100644 index 00000000..d30402a9 --- /dev/null +++ b/users/functionalhacker/programs/ssh.nix @@ -0,0 +1,20 @@ +{ ... }: + +{ + programs.ssh = { + enable = true; + matchBlocks = { + moria = { + hostname = "korhonen.cc"; + user = "balrog"; + port = 221; + }; + + forgejo = { + hostname = "git.korhonen.cc"; + user = "git"; + port = 2882; + }; + }; + }; +} diff --git a/users/functionalhacker/pubkey.asc b/users/functionalhacker/pubkey.asc new file mode 100644 index 00000000..6faaa19b --- /dev/null +++ b/users/functionalhacker/pubkey.asc @@ -0,0 +1,38 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEYwsToBYJKwYBBAHaRw8BAQdApgyyyWCnj7YEUA3QDR0uoYh1fY80gxj4pT7/ +hogiE8G0Ik1hcmtvIEtvcmhvbmVuIDxtYXJrb0Brb3Job25lbi5jYz6JA1UEExYI +Av0CGwEFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTyufcT5+1iczbdheRE+j8o +zZMbsAUCZiKrXlAUgAAAAAAQADdwcm9vZkBhcmlhZG5lLmlkaHR0cHM6Ly9naXQu +a29yaG9uZW4uY2MvRnVuY3Rpb25hbEhhY2tlci9rZXlveGlkZV9wcm9vZkIUgAAA +AAAQAClwcm9vZkBhcmlhZG5lLmlkaHR0cHM6Ly9rb3Job25lbi5zb2NpYWwvQEZ1 +bmN0aW9uYWxIYWNrZXJzFIAAAAAAEABacHJvb2ZAYXJpYWRuZS5pZGh0dHBzOi8v +d3d3LnJlZGRpdC5jb20vdXNlci9GdW5jdGlvbmFsSGFja2VyL2NvbW1lbnRzL3px +M3AxNC92ZXJpZnlpbmdfbXlzZWxmX29uX2tleW94aWRlL1UUgAAAAAAQADxwcm9v +ZkBhcmlhZG5lLmlkaHR0cHM6Ly90Lm1lL0Z1bmN0aW9uYWxIYWNrZXI/cHJvb2Y9 +RnVuY3Rpb25hbEhhY2tlcktleW94aWRlYhSAAAAAABAASXByb29mQGFyaWFkbmUu +aWRodHRwczovL2dpc3QuZ2l0aHViLmNvbS9GdW5jdGlvbmFsSGFja2VyLzNkYzQ0 +YjFkMGI0NjQ4NzU1NDZlNjk5ZTQ5OGJjMjcxMRSAAAAAABAAGHByb29mQGFyaWFk +bmUuaWRkbnM6a29yaG9uZW4uY2M/dHlwZT1UWFRJFIAAAAAAEAAwcHJvb2ZAYXJp +YWRuZS5pZGh0dHBzOi8vZ2l0bGFiLmNvbS9GdW5jdGlvbmFsSGFja2VyL2dpdGxh +Yl9wcm9vZlEUgAAAAAAQADhwcm9vZkBhcmlhZG5lLmlkaHR0cHM6Ly9zdGFja292 +ZXJmbG93LmNvbS91c2Vycy85NzIwNjE0L2Z1bmN0aW9uYWxoYWNrZXI1FIAAAAAA +EAAccHJvb2ZAYXJpYWRuZS5pZGRuczprb3Job25lbi5zb2NpYWw/dHlwZT1UWFQA +CgkQRPo/KM2TG7CRMwEAn3NniIMShI5IfSRF2O2xnmqagVUloAZ247LKheO347gA +/Aj3NZ5th6ZatOYYOnriUdG/n0ep+c4r3adAYez+XjAEuDMEYwsT6xYJKwYBBAHa +Rw8BAQdAlU+492nCWsdz7TtcId37uY2OMsicGbngHzBhAifz7OyI9QQYFggAJgIb +AhYhBPK59xPn7WJzNt2F5ET6PyjNkxuwBQJldO5uBQkGLEGDAIF2IAQZFggAHRYh +BKkizeGrnbX9P8BiPKf3i8uFnNiQBQJjCxPrAAoJEKf3i8uFnNiQOcEBAPTQvCUC +1MZfATrcVhOiuVKAaurf2F2irwxrrAtdxtjAAQC0wAt1Jezo9+Rknk+3UaSeW/oc +2tAVCAVBZHJml7YUDAkQRPo/KM2TG7AyugD+P/KuVwpue2kpxAbNS5tlwLJ7Jei6 +MRuEfz0WKqiJWPQA/jXxk+biZyZRDgdG6mEwYWfepTNoPmuk3bdEz0rasuYNuDgE +YwsUAhIKKwYBBAGXVQEFAQEHQKUjjetIFMP0z7VTI/g1zZzwZOGLI1p2xI2XoToc +sQJZAwEIB4h+BBgWCAAmAhsMFiEE8rn3E+ftYnM23YXkRPo/KM2TG7AFAmV07m4F +CQYsQWwACgkQRPo/KM2TG7DLEQEAkuy+NOpwZNuH6I4FcgsZF3OI1h5/ArNMbj7j +1TVrSswA/03H3peTQON6095lUlPL53mqMFC7/4P4X6B0RoI5kZkFuDMEYwsUEhYJ +KwYBBAHaRw8BAQdActSt/Qum6ZfpcSQ9bpnXTmyAkxZY6WVbLuzEH6WB1TCIfgQY +FggAJgIbIBYhBPK59xPn7WJzNt2F5ET6PyjNkxuwBQJldO5vBQkGLEFcAAoJEET6 +PyjNkxuwkRQBAMJqapQbqYMn/9KKne0nZQObc+KXLCeP3azJDXG0Bq+yAQDOZTfB +W4VeEw6fEXFEWNfDIVFcS+LzM4xkTxXsTulYDA== +=U8RL +-----END PGP PUBLIC KEY BLOCK----- From 4b1d11152b533b33f6fdde60238cc9b30acd8483 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Oct 2024 16:17:16 +0300 Subject: [PATCH 4/5] Add git aliases --- users/functionalhacker/programs/git.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/users/functionalhacker/programs/git.nix b/users/functionalhacker/programs/git.nix index b0e95f43..55a3f1f7 100644 --- a/users/functionalhacker/programs/git.nix +++ b/users/functionalhacker/programs/git.nix @@ -22,5 +22,10 @@ tool = "nvim"; }; }; + + aliases = { + upstream = "!git push -u origin HEAD"; + recommit = "!git commit -eF $(git rev-parse --git-dir)/COMMIT_EDITMSG"; + }; }; } From 08d3382d52d8e001264e3d550e53a015bf14224b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Oct 2024 16:17:58 +0300 Subject: [PATCH 5/5] Add gnome appindicator extension --- users/functionalhacker/programs/gnome.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/functionalhacker/programs/gnome.nix b/users/functionalhacker/programs/gnome.nix index 72e50ab0..8d634503 100644 --- a/users/functionalhacker/programs/gnome.nix +++ b/users/functionalhacker/programs/gnome.nix @@ -6,6 +6,7 @@ with lib.hm.gvariant; home.packages = with pkgs.gnomeExtensions; [ gsconnect night-theme-switcher + appindicator ]; dconf.settings = { @@ -15,6 +16,7 @@ with lib.hm.gvariant; enabled-extensions = [ "gsconnect@andyholmes.github.io" "nightthemeswitcher@romainvigier.fr" + "appindicatorsupport@rgcjonas.gmail.com" ]; favorite-apps = [