palo
/
nixos-config
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

22.05 upgrade

feature/hass
Ingolf Wagner 2022-06-14 22:56:58 +02:00
parent cf55fee933
commit e2a5d032b5
Signed by: palo
GPG Key ID: 76BF5F1928B9618B
11 changed files with 164 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -38,16 +38,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1645296114,
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
"lastModified": 1655096306,
"narHash": "sha256-3B3zBaQVLL956deZgmucouvkZroObQ4JKHzbIfFS9/c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
"rev": "a119e218ad27bea32057a3463e3694a61c9e3802",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.05",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}

2
flake.nix
View File

@ -7,7 +7,7 @@
url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main";
flake = false;
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
krops = {
url = "github:Mic92/krops";
inputs.nixpkgs.follows = "nixpkgs";

199
nixos/flake.lock
View File

@ -37,17 +37,17 @@
"doom-emacs": {
"flake": false,
"locked": {
"lastModified": 1626604817,
"narHash": "sha256-z+dvjB02cHU+VQ5EMkzqSdX817PZar9AkmmfK27q0vo=",
"owner": "hlissner",
"repo": "doom-emacs",
"rev": "46732c0adaef147144418f9f284ca6b1183ab96f",
"lastModified": 1654347726,
"narHash": "sha256-B4N+UQ0SvnCH0Hqc62Wl1KS6WcTBGLag0BoH3UZGbgo=",
"owner": "doomemacs",
"repo": "doomemacs",
"rev": "bea3cc161c0a803dcf574f32ee555dccf565a5ce",
"type": "github"
},
"original": {
"owner": "hlissner",
"ref": "develop",
"repo": "doom-emacs",
"owner": "doomemacs",
"ref": "master",
"repo": "doomemacs",
"type": "github"
}
},
@ -55,15 +55,14 @@
"inputs": {
"doom-emacs": "doom-emacs",
"doom-snippets": "doom-snippets",
"emacs-overlay": [
"emacs-overlay"
],
"emacs-overlay": "emacs-overlay",
"emacs-so-long": "emacs-so-long",
"evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode",
"flake-utils": "flake-utils",
"format-all": "format-all",
"nix-straight": "nix-straight",
"nixpkgs": [
"nixpkgs"
@ -78,15 +77,15 @@
"rotate-text": "rotate-text"
},
"locked": {
"lastModified": 1627398156,
"narHash": "sha256-Ru1aV3NuIFXAsvUE3de8KR7xDZOo1GCBJdsWKJn+Ebw=",
"owner": "vlaci",
"lastModified": 1655058854,
"narHash": "sha256-q69pc4pQrFW4smr/rbqFLauanvdLgC9gduBm1Cd5148=",
"owner": "nix-community",
"repo": "nix-doom-emacs",
"rev": "fee14d217b7a911aad507679dafbeaa8c1ebf5ff",
"rev": "ba55ef6f304969dba4e6db00098a6327d3f76813",
"type": "github"
},
"original": {
"owner": "vlaci",
"owner": "nix-community",
"repo": "nix-doom-emacs",
"type": "github"
}
@ -94,27 +93,43 @@
"doom-snippets": {
"flake": false,
"locked": {
"lastModified": 1625547004,
"narHash": "sha256-V+ytAjB4ZZ+5dJJAu1OY7SbnqrokX5PVBWs0AsgQ8Vs=",
"owner": "hlissner",
"repo": "doom-snippets",
"rev": "5c0eb5bd70f035cefb981c2ce64f4367498bdda6",
"lastModified": 1651768501,
"narHash": "sha256-55mHNFfn3N8k4aWgswX9buATsOhQTJ0L05UaUNNMgDg=",
"owner": "doomemacs",
"repo": "snippets",
"rev": "f74b11b1e0fe8481e20f3065e355efe627e635de",
"type": "github"
},
"original": {
"owner": "hlissner",
"repo": "doom-snippets",
"owner": "doomemacs",
"repo": "snippets",
"type": "github"
}
},
"emacs-overlay": {
"flake": false,
"locked": {
"lastModified": 1650801016,
"narHash": "sha256-3fsEcEs14E/ZFXB4KLy5xicwTeOxW9EBlKn3amc/18s=",
"lastModified": 1655032304,
"narHash": "sha256-t0E7c7V+hk6ILXl4+TBLqQfqq8/4IKyb/cFg0a8mqI8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "d50f841db7b856d79fcfc1a71582dfb5ee1a5830",
"rev": "a73897fc387a83c8dd2142ed597041113954ec23",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1655233443,
"narHash": "sha256-pL5d/smagVpW/7/MuX7uOusCRZ3Ak+uWvr4BK+0WtHQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "859fbd8964ae5605e44020a559d73905f1e1cfa5",
"type": "github"
},
"original": {
@ -227,11 +242,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1623875721,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
@ -285,6 +300,23 @@
"type": "github"
}
},
"format-all": {
"flake": false,
"locked": {
"lastModified": 1581716637,
"narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=",
"owner": "lassik",
"repo": "emacs-format-all-the-code",
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github"
},
"original": {
"owner": "lassik",
"repo": "emacs-format-all-the-code",
"rev": "47d862d40a088ca089c92cd393c6dca4628f87d3",
"type": "github"
}
},
"grocy-scanner": {
"inputs": {
"barcode-reader": "barcode-reader",
@ -313,11 +345,11 @@
]
},
"locked": {
"lastModified": 1649887911,
"narHash": "sha256-Af0Ppb1RZ7HWuxUvF0/O7h3cy8tqU2eKFyVwyA1ZD+w=",
"lastModified": 1651519540,
"narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7244c6715cb8f741f3b3e1220a9279e97b2ed8f5",
"rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
"type": "github"
},
"original": {
@ -350,16 +382,15 @@
"nix-straight": {
"flake": false,
"locked": {
"lastModified": 1621543597,
"narHash": "sha256-E/m2Hrw2og//CfOCOWe2yapYC01Tqhozn4YMPYJsC3o=",
"owner": "vlaci",
"lastModified": 1643475817,
"narHash": "sha256-NpExq5nbPbj/ppkBX3SnETEJuOne1MKJxen8vVHsDFg=",
"owner": "nix-community",
"repo": "nix-straight.el",
"rev": "8e84d04f10b2298de856b2b8b9a0d13abc91b5ca",
"rev": "08d75e5651cb52f8a07e03408ed19e04bee07505",
"type": "github"
},
"original": {
"owner": "vlaci",
"ref": "v2.2.0",
"owner": "nix-community",
"repo": "nix-straight.el",
"type": "github"
}
@ -379,6 +410,38 @@
"type": "github"
}
},
"nixpkgs-21_11": {
"locked": {
"lastModified": 1654346688,
"narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-22_05": {
"locked": {
"lastModified": 1654373220,
"narHash": "sha256-3vKFnZz2oYHo4YcelaNOhO4XQ2jiIEXrp1s4w+e773c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d6cb04299ce8964290ae7fdcb87aa50da0500b5c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-fmt": {
"inputs": {
"fenix": "fenix",
@ -388,11 +451,11 @@
]
},
"locked": {
"lastModified": 1649676836,
"narHash": "sha256-93oaTaJmblljn05feIs3oWQ6yyhKw/mDqFS/B00kQmw=",
"lastModified": 1654597974,
"narHash": "sha256-/h0s8OfYs4c8SPFjZUnY8JmrheWkMMuQ6pkbpPWj5Vs=",
"owner": "nix-community",
"repo": "nixpkgs-fmt",
"rev": "f1e0ea288f6217a41530d7079df1c011a3cd35a2",
"rev": "7ddc2a76e6a6f90b4a63723bc0c0bbe8d5324fdc",
"type": "github"
},
"original": {
@ -403,11 +466,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1650701402,
"narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
"lastModified": 1655130522,
"narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
"rev": "13f08d71ceff5101321e0291854495a1ec153a5e",
"type": "github"
},
"original": {
@ -419,16 +482,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1650728030,
"narHash": "sha256-VfCYsC/0mZQlQqsXf5o5Cib1ncJQ5l7WHN7hEIMmZNw=",
"lastModified": 1655200170,
"narHash": "sha256-/yzkX+10sJhYNIcTtZ5ObS+nh/HrJp01XLaubzbRDcU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5fb3a179605141bfa4c9c423f9b1c33658b059c8",
"rev": "9ff91ce2e4c5d70551d4c8fd8830931c6c6b26b8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
@ -449,11 +512,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1638097282,
"narHash": "sha256-EXCzj9b8X/lqDPJapxZThIOKL5ASbpsJZ+8L1LnY1ig=",
"lastModified": 1654245945,
"narHash": "sha256-PV6MZ+HuNnyLxQGa2rwt0BmCRkQS2xqhc+SeJLQM+WU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "78cb77b29d37a9663e05b61abb4fa09465da4b70",
"rev": "442db9429b9fbdb6352cfb937afc8ecccfe2633f",
"type": "github"
},
"original": {
@ -498,11 +561,11 @@
"org": {
"flake": false,
"locked": {
"lastModified": 1627155762,
"narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=",
"lastModified": 1654949849,
"narHash": "sha256-1xGPQv2rFF4KglqwjKz+1uzB81nqa+6lgXPpnU3mduE=",
"owner": "emacs-straight",
"repo": "org-mode",
"rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237",
"rev": "ed6f8dc67f5f1abf6b20929bdb571def2c191006",
"type": "github"
},
"original": {
@ -514,11 +577,11 @@
"org-contrib": {
"flake": false,
"locked": {
"lastModified": 1623339452,
"narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=",
"ref": "master",
"rev": "fc81309cf6756607a836f93049a9393c2967c4e0",
"revCount": 2599,
"lastModified": 1654411077,
"narHash": "sha256-ywXAI+s+D701PvuDEQljDmFWrTPymqustSYVyf3NYRk=",
"ref": "refs/heads/master",
"rev": "c6aef31ccfc7c4418c3b51e98f7c3bd8e255f5e6",
"revCount": 2622,
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
},
@ -581,11 +644,11 @@
"revealjs": {
"flake": false,
"locked": {
"lastModified": 1625811744,
"narHash": "sha256-Y67nVqcovn2PbHXmWOFWMq10Qz2ZIRyyWEO6qsZLbIM=",
"lastModified": 1653993278,
"narHash": "sha256-X43lsjoLBWmttIKj9Jzut0UP0dZlsue3fYbJ3++ojbU=",
"owner": "hakimel",
"repo": "reveal.js",
"rev": "b18f12d964ef80bd9ffb061aae48ff4c15fb43ad",
"rev": "039972c730690af7a83a5cb832056a7cc8b565d7",
"type": "github"
},
"original": {
@ -598,7 +661,7 @@
"inputs": {
"cluster-module": "cluster-module",
"doom-emacs-nix": "doom-emacs-nix",
"emacs-overlay": "emacs-overlay",
"emacs-overlay": "emacs-overlay_2",
"grocy-scanner": "grocy-scanner",
"home-manager": "home-manager",
"home-manager-utils": "home-manager-utils",
@ -644,14 +707,16 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_4",
"nixpkgs-21_11": "nixpkgs-21_11",
"nixpkgs-22_05": "nixpkgs-22_05"
},
"locked": {
"lastModified": 1649756291,
"narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=",
"lastModified": 1654401128,
"narHash": "sha256-uCdQ2fzIPGakHw2TkvOncUvCl7Fo7z/vagpDWYooO7s=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8",
"rev": "f075361ecbde21535b38e41dfaa28a28f160855c",
"type": "github"
},
"original": {

6
nixos/flake.nix
View File

@ -2,7 +2,7 @@
description = "system flake.nix";
inputs = {
sops-nix.url = "github:Mic92/sops-nix";
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
polygon-art = {
url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
@ -12,9 +12,9 @@
flake = false;
};
doom-emacs-nix = {
url = "github:vlaci/nix-doom-emacs";
url = "github:nix-community/nix-doom-emacs";
inputs.nixpkgs.follows = "nixpkgs";
inputs.emacs-overlay.follows = "emacs-overlay";
#inputs.emacs-overlay.follows = "emacs-overlay";
};
home-manager = {
url = "github:nix-community/home-manager/release-21.11";

2
nixos/modules/programs/easytag.nix
View File

@ -13,7 +13,7 @@ in
mkEnableOption "install easytag with dependencies";
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ easytag gnome3.dconf ];
environment.systemPackages = with pkgs; [ easytag dconf ];
};
}

3
nixos/modules/system/font.nix
View File

@ -61,7 +61,8 @@ in
# ------------
# nerdfonts
powerline-fonts
font-awesome-ttf
#font-awesome-ttf
font-awesome
fira-code-symbols
# shell font

6
nixos/pkgs/otpmenu/default.nix
View File

@ -2,7 +2,7 @@
, symlinkJoin
, rofi
, gnused
, pass-otp
, pass
, writeTextFile
, writeShellScriptBin
, xdotool
@ -33,12 +33,12 @@ let
set -efu
x=$(
${pass-otp}/bin/pass git ls-files '*/otp.gpg' \
${pass.withExtensions (ext: [ext.pass-otp])}/bin/pass git ls-files '*/otp.gpg' \
| ${gnused}/bin/sed 's:/otp\.gpg$::' \
| ${rofi}/bin/rofi -dmenu -f -p OTP
)
otp=$(${pass-otp}/bin/pass otp code "$x/otp")
otp=$(${pass.withExtensions (ext: [ext.pass-otp])}/bin/pass otp code "$x/otp")
printf %s "$otp" | ${xdotool}/bin/xdotool type -f -
'';

2
nixos/system/all/packages.nix
View File

@ -68,7 +68,7 @@ in
ntfs3g
exfat
ag
silver-searcher
bc
bridge-utils
file

4
nixos/system/desktop/home-manager/dunst.nix
View File

@ -2,7 +2,7 @@
home-manager.users.mainUser = {
services.dunst = {
enable = true;
enable = false;
settings = {
global = {
font = "Iosevka Term 11";
@ -148,7 +148,7 @@
startup_notification = true;
# dmenu path.
dmenu = "${pkgs.dmenu}/bin/dmenu -p dunst:";
#dmenu = "${pkgs.dmenu}/bin/dmenu -p dunst:";
# Browser for opening urls in context menu.
# browser = /usr/bin/firefox -new-tab

26
nixos/system/desktop/packages.nix
View File

@ -225,7 +225,7 @@ in
irc
manpages
man-pages
emo
(library.desktopFile emo {
@ -285,16 +285,16 @@ in
# cantata
ncmpcpp
(pkgs.dragon-drop.overrideAttrs (old: rec {
pname = "dragon-drop";
version = "1.1.1";
src = fetchFromGitHub {
owner = "mwh";
repo = "dragon";
rev = "v${version}";
sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
};
}))
#(pkgs.dragon-drop.overrideAttrs (old: rec {
# pname = "dragon-drop";
# version = "1.1.1";
# src = fetchFromGitHub {
# owner = "mwh";
# repo = "dragon";
# rev = "v${version}";
# sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
# };
#}))
dino # jabber client
@ -345,7 +345,7 @@ in
nethogs
netsniff-ng
iftop
wireguard
#wireguard
ffmpeg
(writeShellScriptBin "shrink-exports"
@ -360,7 +360,7 @@ in
cairo
w3m
links
links2
lynx
# temperature

4
nixos/system/desktop/pass.nix
View File

@ -28,8 +28,8 @@ in
{
environment.systemPackages = [
pkgs.pass-otp
(desktopFile "passmenu" "${pkgs.pass-otp}/bin/passmenu --type -l 10")
(pkgs.pass.withExtensions (ext: [ ext.pass-otp ]))
(desktopFile "passmenu" "${pkgs.pass.withExtensions (ext: [ext.pass-otp])}/bin/passmenu --type -l 10")
# todo ein script machen was hier tut
# zbarimg -q --raw 2018-12-18-114509.png | pass otp insert mindcurv/cloudamqp/otp