muhh/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Activity

Save current working state from laptop to get this to the new workstation

Browse source
This commit is contained in:
Markus Heurung 2024-04-11 16:26:54 +02:00
parent 8106fbb14d
commit 8550329330
5 changed files with 75 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configuration.nix
View file

@ -63,13 +63,6 @@
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #jack.enable = true;
}; };
services.syncthing = {
enable = true;
user = "muhh";
dataDir = "/home/muhh/Sync";
configDir = "/home/muhh/.config/syncthing";
};
services.tailscale = { services.tailscale = {
enable = true; enable = true;
}; };
@ -86,7 +79,7 @@
isNormalUser = true; isNormalUser = true;
name = "muhh"; name = "muhh";
description = "Markus Heurung"; description = "Markus Heurung";
extraGroups = [ "networkmanager" "video" "wheel" ]; extraGroups = [ "input" "networkmanager" "video" "wheel" ];
shell = pkgs.fish; shell = pkgs.fish;
linger = true; linger = true;
}; };

66
flake.lock
View file

@ -9,11 +9,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710156081, "lastModified": 1711099426,
"narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -96,11 +96,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1710146030,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703887061, "lastModified": 1709087332,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -138,11 +138,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710714957, "lastModified": 1712093955,
"narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "rev": "80546b220e95a575c66c213af1b09fe255299438",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710714957, "lastModified": 1711625603,
"narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,11 +181,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710717205, "lastModified": 1711763326,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +196,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710631334, "lastModified": 1711703276,
"narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710628718, "lastModified": 1711819797,
"narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,11 +238,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1710764166, "lastModified": 1712057047,
"narHash": "sha256-sn9+jsAxmSTKX5C31xTDqwGc+IAlz4Q5n+eVE+MRrZk=", "narHash": "sha256-o5KSQO82/sCgaaSsZONTeb+P47MXo0bbp+eID9I0CwI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "f876a0a2e9abc8945e312e6587b1f78d466de184", "rev": "7baefc8aa587931827797db7fbd55a733179dc79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +266,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708018599, "lastModified": 1711760932,
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "rev": "c11e43aed6f17336c25cd120eac886b96c455731",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,11 +295,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1710644594, "lastModified": 1711855048,
"narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
"type": "github" "type": "github"
}, },
"original": { "original": {

39
home.nix
View file

@ -20,6 +20,7 @@
# '') # '')
_1password _1password
_1password-gui _1password-gui
atkinson-hyperlegible
brightnessctl brightnessctl
curl curl
distrobox distrobox
@ -31,6 +32,7 @@
powertop powertop
qutebrowser qutebrowser
solargraph solargraph
sops
tmux tmux
wget wget
wl-clipboard wl-clipboard
@ -70,15 +72,18 @@
accounts = { accounts = {
email = { email = {
accounts = { accounts = {
mailbox = { privat = {
primary = true; primary = true;
address = "markus@heurung.net"; address = "markus@heurung.net";
realName = "Markus Heurung"; realName = "Markus Heurung";
userName = "markus@heurung.net"; userName = "markus@heurung.net";
passwordCommand = "op read op://personal/mailbox.org/password"; passwordCommand = ''(/run/current-system/sw/bin/cat $XDG_RUNTIME_DIR/secrets/mail/privat/password)'';
imap.host = "imap.mailbox.org"; imap.host = "imap.mailbox.org";
#neomutt.enable = true; # neomutt.enable = true;
#mbsync.enable = true; mbsync = {
enable = true;
create = "both";
};
}; };
}; };
}; };
@ -87,6 +92,9 @@
atuin = { atuin = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
flags = [
"--disable-up-arrow"
];
}; };
bat = { bat = {
enable = true; enable = true;
@ -193,9 +201,10 @@
scrollback_lines = 10000; scrollback_lines = 10000;
scrollback_pager_history_size = 4096; scrollback_pager_history_size = 4096;
strip_trailing_space = "smart"; strip_trailing_space = "smart";
tab_bar_min_tabs = 1;
tab_bar_edge = "bottom"; tab_bar_edge = "bottom";
tab_powerline_style = "slanted"; tab_bar_min_tabs = 2;
tab_bar_style = "powerline";
tab_powerline_style = "round";
tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}"; tab_title_template = "{title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}";
}; };
theme = "Catppuccin-Mocha"; theme = "Catppuccin-Mocha";
@ -259,7 +268,7 @@
tabstop = 2; tabstop = 2;
}; };
plugins = { plugins = {
comment-nvim.enable = true; comment.enable = true;
cmp-cmdline.enable = true; cmp-cmdline.enable = true;
cmp-fish.enable = true; cmp-fish.enable = true;
cmp-nvim-lsp.enable = true; cmp-nvim-lsp.enable = true;
@ -322,6 +331,9 @@
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
]; ];
}; };
mbsync = {
enable = true;
};
ripgrep.enable = true; ripgrep.enable = true;
starship = { starship = {
enable = true; enable = true;
@ -334,6 +346,11 @@
}; };
services = { services = {
mbsync = {
enable = true;
preExec = "";
postExec = "";
};
espanso = { espanso = {
enable = true; enable = true;
package = pkgs.espanso-wayland; package = pkgs.espanso-wayland;
@ -359,6 +376,11 @@
swayidle = { swayidle = {
enable = true; enable = true;
}; };
syncthing = {
enable = true;
# dataDir = "/home/muhh/Sync";
# configDir = "/home/muhh/.config/syncthing";
};
}; };
sops = { sops = {
@ -366,6 +388,9 @@
defaultSopsFile = ./secrets/secrets.yaml; defaultSopsFile = ./secrets/secrets.yaml;
secrets = { secrets = {
just_a_test = {}; just_a_test = {};
"mail/privat/address" = {};
"mail/privat/username" = {};
"mail/privat/password" = {};
}; };
}; };

2
justfile Normal file
View file

@ -0,0 +1,2 @@
default:
echo 'Hello, world!'

9
secrets/secrets.yaml
View file

@ -1,4 +1,9 @@
just_a_test: ENC[AES256_GCM,data:HDhSG6BejOadBaeW,iv:idSJWRevqi4h/gaTREOt5tGfamRcxSUSmaelgyZUmu0=,tag:jo5lugFHpdjGeo/RtN86DA==,type:str] just_a_test: ENC[AES256_GCM,data:HDhSG6BejOadBaeW,iv:idSJWRevqi4h/gaTREOt5tGfamRcxSUSmaelgyZUmu0=,tag:jo5lugFHpdjGeo/RtN86DA==,type:str]
mail:
privat:
address: ENC[AES256_GCM,data:MdODBjT/vGmoZidXYppWX0EN,iv:Ai2YVodb/vOEyCK2spnH1vwPJrdvqIHM40ZGhALHq8A=,tag:ge1dIDEgiSYVJGNwuq+qKw==,type:str]
username: ENC[AES256_GCM,data:492WNo3Dw9hFMUnVEGW/Cd6L,iv:WWbO8gX9kqiFsNGYPnp44m52fMkeHojiSXGhcl2a3wM=,tag:fILTYxn3QY1xvwLuU8EdSQ==,type:str]
password: ENC[AES256_GCM,data:Oa3tYztCeY0Nvun+34bAji+9b/g=,iv:Sbx/d2H35wlPvsfomwAF+aT3kBCV70+GDi0Lj5lqTII=,tag:xHC6yGlsTroja8CMOTx/rQ==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -14,8 +19,8 @@ sops:
aHFLbEp5TjRlSzdvVkpEdU5RZ2RKUlUK1/GYeQir6dDprPMJrKI+4tBJokKc8Azz aHFLbEp5TjRlSzdvVkpEdU5RZ2RKUlUK1/GYeQir6dDprPMJrKI+4tBJokKc8Azz
+pnBPXwXhAHIHXjKv88trcRkmFraOYkAu4lVpdyt/4FtbtvFvouBgw== +pnBPXwXhAHIHXjKv88trcRkmFraOYkAu4lVpdyt/4FtbtvFvouBgw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-03-18T19:19:57Z" lastmodified: "2024-03-29T16:25:56Z"
mac: ENC[AES256_GCM,data:EusDIuYetHRL0I5b4Oqe7zfHV085/uQkrB4W/mApC+/ypaSKMkXrGBbhfj5tgveTVmXpaItK+WG/ynDptS0nQVsVOh4WCsuyGkltQsy3fLc0BxiIyr7qVBY2JccQO1Ssn83BXGEn3bhiBChFXLz7++/yEQtJrGqkF4lzCskJ8xQ=,iv:sEdyHOOe9tcJP7TG5CGOCw87HUE+d6lLL6Ypnx76yUw=,tag:JK/SPy+nQj3GdSsN6WttBg==,type:str] mac: ENC[AES256_GCM,data:C1M3zxOYKLA8acsZVubXBure9zda2SyPWRqv2howmHgrBujkrZaqSL47kt9a1E5simqYdCmzqlLIhjW5wRq/kcunFFTewgZ6QFqVUphLHk1WHxm3MHF7oYDUr9E7Z0BH/SYHim7Ruc2Cc0Hy0YdH/hjgcf2vdqjWFWMTX3aeo0w=,iv:mhEgskDzDz5sNSaBIfEmI1tbXkkRnG5ruzK3TL0lXys=,tag:y+IPy1uYzbCAALEZCjYz8w==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1