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

cream: 22.11 -> 23.05

feature/nixinite
Ingolf Wagner 2023-06-29 10:08:09 +02:00
parent 0f1fb837b9
commit 7c10538858
Signed by: palo
GPG Key ID: 76BF5F1928B9618B
12 changed files with 129 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
flake.lock
View File

@ -49,11 +49,11 @@
]
},
"locked": {
"lastModified": 1684783210,
"narHash": "sha256-hxRbwwBTu1G1u1EdI9nEo/n4HIsQIfNi+2BQ1nEoj/o=",
"lastModified": 1687968164,
"narHash": "sha256-L9jr2zCB6NIaBE3towusjGBigsnE2pMID8wBGkYbTS4=",
"owner": "nix-community",
"repo": "disko",
"rev": "f0b9f374bb42fdcd57baa7d4448ac5d4788226bd",
"rev": "8002e7cb899bc2a02a2ebfb7f999fcd7c18b92a1",
"type": "github"
},
"original": {
@ -85,6 +85,7 @@
"doom-snippets": "doom-snippets",
"emacs-overlay": "emacs-overlay",
"emacs-so-long": "emacs-so-long",
"evil-collection": "evil-collection",
"evil-escape": "evil-escape",
"evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode",
@ -110,11 +111,11 @@
"ws-butler": "ws-butler"
},
"locked": {
"lastModified": 1683249650,
"narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=",
"lastModified": 1686959076,
"narHash": "sha256-tzwHJ8q9CMpIwxcyCM51i88arntNMARi1mFkAppMgqk=",
"owner": "nix-community",
"repo": "nix-doom-emacs",
"rev": "588ccf37fa9eb9d2ec787b91c989dcd6892983e9",
"rev": "2c4ba0d77fdfa4495929c8aee814936e722715c5",
"type": "github"
},
"original": {
@ -159,11 +160,11 @@
"emacs-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1685293468,
"narHash": "sha256-weksQQ0YGFk6pjW4Ms5eC1HURH8otWjIb8lJhkvKkZE=",
"lastModified": 1688019553,
"narHash": "sha256-zoRQUZaBSDRx7CvxI+JlzqcishY0DgMRlzwI6i4IXg8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "8b10f751e48ae0e48b3f037a352c7447dc7d1afe",
"rev": "a296b6e6d151351589f643b656f7c92188cabadb",
"type": "github"
},
"original": {
@ -188,6 +189,22 @@
"type": "github"
}
},
"evil-collection": {
"flake": false,
"locked": {
"lastModified": 1686801899,
"narHash": "sha256-wGJWF9t8yaxLyYQRf3hK+5/AIYYAS8qWXPDEvatzBlc=",
"owner": "emacs-evil",
"repo": "evil-collection",
"rev": "4a7d924dbd851ef1b2ccb85778be6e7a6a81ebd4",
"type": "github"
},
"original": {
"owner": "emacs-evil",
"repo": "evil-collection",
"type": "github"
}
},
"evil-escape": {
"flake": false,
"locked": {
@ -457,20 +474,19 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
]
},
"locked": {
"lastModified": 1681092193,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"lastModified": 1687871164,
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@ -503,11 +519,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1685177663,
"narHash": "sha256-T3WC47AyxwPxwCmukrwE/alZLU3bu7ZuBrCW5DMefI8=",
"lastModified": 1687153676,
"narHash": "sha256-Q0VJWVBxmmKe55V7Lb+oqoOWWr5vhB46kEzU7v4jVD8=",
"owner": "kmonad",
"repo": "kmonad",
"rev": "97ac050f9818e942a706194adb7374f7b10ee339",
"rev": "2c658f6fddca39686a5448a0207a4aba215f3be5",
"type": "github"
},
"original": {
@ -554,11 +570,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1684899633,
"narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
"lastModified": 1686838567,
"narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
"rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
"type": "github"
},
"original": {
@ -591,11 +607,11 @@
]
},
"locked": {
"lastModified": 1678089153,
"narHash": "sha256-Kr6EDc4RZuUHUu4rP+gh4CQSMH35RDJJ9600vAPZVzo=",
"lastModified": 1687333264,
"narHash": "sha256-tSfLls1bg2oelCQky8QCgpniFDH2OTG/2NycpBkNJKE=",
"owner": "nix-community",
"repo": "nixpkgs-fmt",
"rev": "398c5226d3402ec075d36c504a4575c40d01cf0c",
"rev": "6d2dee8954cc4e790dede82ddff2aeac4a32da46",
"type": "github"
},
"original": {
@ -606,11 +622,43 @@
},
"nixpkgs-legacy": {
"locked": {
"lastModified": 1682600000,
"narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
"lastModified": 1687666471,
"narHash": "sha256-88VoE8jLzjRhH38mUUrom+zJ7GVMjuW4M321Iri5C/w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
"rev": "6610eb320efb234025e477e51ae7625ccd65a2e8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-legacy_2105": {
"locked": {
"lastModified": 1659914493,
"narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-legacy_2205": {
"locked": {
"lastModified": 1685573264,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "380be19fbd2d9079f677978361792cb25e8a3635",
"type": "github"
},
"original": {
@ -622,27 +670,27 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1685215858,
"narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
"lastModified": 1687031877,
"narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
"rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-22.11",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1685168767,
"narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=",
"lastModified": 1687898314,
"narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262",
"rev": "e18dc963075ed115afb3e312b64643bf8fd4b474",
"type": "github"
},
"original": {
@ -669,16 +717,16 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1685215858,
"narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
"lastModified": 1687829761,
"narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
"rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.11",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@ -699,11 +747,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1685012353,
"narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=",
"lastModified": 1686979235,
"narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aeb75dba965e790de427b73315d5addf91a54955",
"rev": "7cc30fd5372ddafb3373c318507d9932bd74aafe",
"type": "github"
},
"original": {
@ -852,24 +900,25 @@
"locked": {
"lastModified": 1682948724,
"narHash": "sha256-hTSiqRTpKuPksq5vsAO0pIuHdYIaL5EGrmN0T6C3oog=",
"ref": "refs/heads/main",
"ref": "main",
"rev": "84460fabef41115fa12323c9eaf89abfbe76f22f",
"revCount": 10,
"type": "git",
"url": "file:///home/palo/dev/nixos/nixos-private-assets"
"url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git"
},
"original": {
"ref": "main",
"type": "git",
"url": "file:///home/palo/dev/nixos/nixos-private-assets"
"url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git"
}
},
"retiolum": {
"locked": {
"lastModified": 1682697608,
"narHash": "sha256-SGhjlOQx9vDRrIxm+kyZzDjpiZDTzM3zLCLNgqWPmPY=",
"lastModified": 1686076643,
"narHash": "sha256-midjyNXeGAqXzwXKnHNsTnRwPIbturlq2FcHOh9fivg=",
"owner": "Mic92",
"repo": "retiolum",
"rev": "e0a7f5bf65c7097949d4e07aafd24aabec8d5852",
"rev": "f79b533caf30820d93a79878d871c08faa35b3f4",
"type": "github"
},
"original": {
@ -909,6 +958,8 @@
"nixpkgs": "nixpkgs_3",
"nixpkgs-fmt": "nixpkgs-fmt",
"nixpkgs-legacy": "nixpkgs-legacy",
"nixpkgs-legacy_2105": "nixpkgs-legacy_2105",
"nixpkgs-legacy_2205": "nixpkgs-legacy_2205",
"nixpkgs-unstable": "nixpkgs-unstable",
"permown": "permown",
"polygon-art": "polygon-art",
@ -990,11 +1041,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1685242617,
"narHash": "sha256-UBPXGfGwGMJm2Wj9kDj8+TMMK2PTouSM/TpiXYtaqtQ=",
"lastModified": 1687398569,
"narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "3e016341d4dca6ce7c62316f90e66341841a30f9",
"rev": "2ff6973350682f8d16371f8c071a304b8067f192",
"type": "github"
},
"original": {
@ -1050,21 +1101,6 @@
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ws-butler": {
"flake": false,
"locked": {

25
flake.nix
View File

@ -8,20 +8,23 @@
url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main";
flake = false;
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05";
nixos-hardware = {
url = "github:nixos/nixos-hardware";
inputs.nixpkgs.follows = "nixpkgs";
};
# colmena
# -------
home-manager = {
url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs";
};
colmena = {
url = "github:zhaofengli/colmena";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy.url = "github:nixos/nixpkgs/nixos-22.05";
polygon-art = {
url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
};
@ -35,10 +38,6 @@
inputs.nixpkgs.follows = "nixpkgs";
#inputs.emacs-overlay.follows = "emacs-overlay";
};
home-manager = {
url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager-utils = {
url = "github:mrvandalo/home-manager-utils";
inputs.home-manager.follows = "home-manager";
@ -57,8 +56,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
private_assets = {
url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
#url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
#url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
flake = true;
};
retiolum = {
@ -99,6 +98,8 @@
, nixpkgs
, nixpkgs-fmt
, nixpkgs-legacy
, nixpkgs-legacy_2105
, nixpkgs-legacy_2205
, nixpkgs-unstable
, permown
, polygon-art

16
nixos/components/network/bind9.nix
View File

@ -1,16 +0,0 @@
{ ... }:
{
services.bind = {
enable = false;
zones = {
private = {
name = "*.private";
extraConfig = "";
file = "/var/dns/tinc.private";
master = true;
#masters = [ "192.168.0.1" ];
#slaves = [ ];
};
};
};
}

1
nixos/components/network/default.nix
View File

@ -15,7 +15,6 @@ with types;
./hosts.nix
./wifi.nix
#./avahi.nix
#./bind9.nix
];
config = mkIf config.components.network.enable { };

4
nixos/components/network/sshd/default.nix
View File

@ -40,8 +40,8 @@ in
services.openssh = {
enable = true;
forwardX11 = false;
passwordAuthentication = false;
settings.X11Forwarding = false;
settings.PasswordAuthentication = false;
};
users.users.root.openssh.authorizedKeys.keyFiles = cfg.rootKeyFiles ++ defaultRootKeyFiles;

2
nixos/components/network/wifi.nix
View File

@ -27,7 +27,7 @@ with types;
hardware.enableRedistributableFirmware = true;
# because Networkd-wait-online is just failing.
systemd.services.systemd-networkd-wait-online.enable = false;
# systemd.services.systemd-networkd-wait-online.enable = false;
systemd.services.NetworkManager-wait-online.enable = false;
environment.systemPackages = [

2
nixos/machines/cream/configuration.nix
View File

@ -6,6 +6,8 @@
../../system/desktop
../../system/server/netdata.nix
./strange_2305_upgrade.nix
./hardware-configuration.nix
./packages.nix
./syncthing.nix

5
nixos/machines/cream/hardware-configuration.nix
View File

@ -17,7 +17,7 @@
# Use the systemd-boot EFI boot loader, not grub
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmpOnTmpfs = true; # make /tmp a tmpfs (performance!)
boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
boot.initrd.luks.devices = {
pool = {
@ -68,7 +68,4 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
}

2
nixos/machines/cream/packages.nix
View File

@ -55,7 +55,7 @@ in
blueberry
nextcloud-client
gimp
#gimp
inkscape
imagemagick

5
nixos/machines/cream/strange_2305_upgrade.nix Normal file
View File

@ -0,0 +1,5 @@
{
nixpkgs.config.permittedInsecurePackages = [
"python-2.7.18.6"
];
}

4
nixos/pkgs/default.nix
View File

@ -10,8 +10,8 @@ in {
emo = callPackage ./emoji { };
light-control = callPackage ./light-control { };
otpmenu = callPackage ./otpmenu { };
sononym = callPackage ./sononym { };
sononym-crawler = callPackage ./sononym-crawler { };
#sononym = callPackage ./sononym { };
#sononym-crawler = callPackage ./sononym-crawler { };
taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
terminal-tools = callPackage ./terminal-tools { };

2
nixos/system/desktop/default.nix
View File

@ -6,7 +6,7 @@
#./icecast.nix
#./audio.nix
./mail-stuff.nix
#./mail-stuff.nix
./packages.nix
./size.nix
#./user.nix