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

Compare commits

base: palo:e54b1d50d27e0e7c1b627b8600d42f12557d3918
Branches Tags
palo:main
palo:update
palo:refactor/component/ssh
palo:orbi-ssh-unlock-works
...
compare: palo:aa11982ecb15d0eec30b96b1383cb70168d9ff44
Branches Tags
palo:main
palo:update
palo:refactor/component/ssh
palo:orbi-ssh-unlock-works

2 commits
e54b1d50d2 ... aa11982ecb

Author SHA1 Message Date
Ingolf Wagner aa11982ecb
upgrade cream 2023-12-08 21:27:52 +01:00
Ingolf Wagner 40f8d7f4be
23.05 -> 23.11 2023-12-08 21:27:13 +01:00
17 changed files with 119 additions and 126 deletions
Show stats Expand all files Collapse all files

118
flake.lock
View file

@ -47,11 +47,11 @@
]
},
"locked": {
"lastModified": 1699781810,
"narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=",
"lastModified": 1701905325,
"narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=",
"owner": "nix-community",
"repo": "disko",
"rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df",
"rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe",
"type": "github"
},
"original": {
@ -129,11 +129,11 @@
"ws-butler": "ws-butler"
},
"locked": {
"lastModified": 1697814738,
"narHash": "sha256-mwQmykamvRuHmO6I2VTm8+TOIhhmgy2g5YrMjoCHawY=",
"lastModified": 1701264882,
"narHash": "sha256-MBXR7x7Ua8qystlGr+lenwjQd7dsFNFpEFmtHhh10zM=",
"owner": "nix-community",
"repo": "nix-doom-emacs",
"rev": "c1c99cf41694440d76e31126dc394f52faeb691e",
"rev": "f7413022370f24bb53cb450bfb2803233510113e",
"type": "github"
},
"original": {
@ -175,22 +175,6 @@
"type": "github"
}
},
"emacs-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1700818747,
"narHash": "sha256-7oS3doGg7Y6nW0TU+ZdKxaDKm3A/dyGaGhE0GkDDuLI=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "312d910d5c8e738ed280ebcc7535d6cbc1c44f16",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-so-long": {
"flake": false,
"locked": {
@ -515,16 +499,16 @@
]
},
"locked": {
"lastModified": 1700392168,
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
"lastModified": 1700814205,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.05",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
@ -579,11 +563,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1700205230,
"narHash": "sha256-jF6Qb47maZHTwexI+eY4tL0QAnHJX+MVu74DEWeazA0=",
"lastModified": 1701282310,
"narHash": "sha256-9QaOSN4qiLqmb1auVSurPN1FrXAaZ7M324TQO0oggco=",
"owner": "kmonad",
"repo": "kmonad",
"rev": "cec7d4ac3644c96737da23124e473e13ace5156c",
"rev": "0a761c5e2b7a71a5a203d5f04cd2f7c209e79322",
"type": "github"
},
"original": {
@ -648,11 +632,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1700559156,
"narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
"lastModified": 1701656485,
"narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
"rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
"type": "github"
},
"original": {
@ -685,11 +669,11 @@
]
},
"locked": {
"lastModified": 1697026026,
"narHash": "sha256-kRkk8qpZkIxRj74nBtjnBR1ibQQZOkfCutHnWeWkxZo=",
"lastModified": 1701682646,
"narHash": "sha256-nT6RwwTzTnSbb+7YeC2jGO6evu33PyYX4XaBN5MaJ4g=",
"owner": "nix-community",
"repo": "nixpkgs-fmt",
"rev": "f3fac47d6509e6b23c6103bb833353db348c634f",
"rev": "305d6b64abe7118d85ee3279571918885b8ffaae",
"type": "github"
},
"original": {
@ -746,13 +730,29 @@
"type": "github"
}
},
"nixpkgs-legacy_2305": {
"locked": {
"lastModified": 1701615100,
"narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1700342017,
"narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=",
"lastModified": 1701568804,
"narHash": "sha256-iwr1fjOCvlirVL/xNvOTwY9kg3L/F3TC/7yh/QszaPI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "decdf666c833a325cb4417041a90681499e06a41",
"rev": "dc01248a9c946953ad4d438b0a626f5c987a93e4",
"type": "github"
},
"original": {
@ -764,11 +764,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1700612854,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"lastModified": 1701718080,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
"type": "github"
},
"original": {
@ -811,16 +811,16 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1700678569,
"narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=",
"lastModified": 1701952659,
"narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8f1180704ac35baded1a74164365ac7cdfba6f38",
"rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
@ -857,11 +857,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1700108881,
"narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
"lastModified": 1701336116,
"narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1",
"rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
"type": "github"
},
"original": {
@ -974,11 +974,11 @@
"pandoc_template": "pandoc_template"
},
"locked": {
"lastModified": 1701464175,
"narHash": "sha256-TPITLC3vKtR2vX++k+QD5D7cRMHQneTYSmOvxBkiZNc=",
"lastModified": 1701775518,
"narHash": "sha256-qJ+lyo5/FY35bddRd26y/bpKzRd99lvUeX88iY2VctQ=",
"ref": "main",
"rev": "f41b79dec8ee7c8fb22bdd971bc187ce2d768206",
"revCount": 23,
"rev": "13176fcd5b4689d1b15f1f9d19e946fff45dc3c3",
"revCount": 28,
"type": "git",
"url": "ssh://gitea@git.ingolf-wagner.de/palo/overviewer.git"
},
@ -1077,11 +1077,11 @@
},
"retiolum": {
"locked": {
"lastModified": 1700313880,
"narHash": "sha256-EreRbIevMCD1AApX7V/jMH7iWBIG4hkBMsYJ8JSjdTY=",
"lastModified": 1701943332,
"narHash": "sha256-E7GpAlUcKDB4iXE1jh5s5xnU5m4Ew2TaC7gsuh3zsgw=",
"owner": "Mic92",
"repo": "retiolum",
"rev": "d64d84117ec57bb03e67a2f0b90be8b7fbbc424f",
"rev": "bd87b89d8aed2e29920e604032937095ed0aef36",
"type": "github"
},
"original": {
@ -1111,7 +1111,6 @@
"disko": "disko",
"dns": "dns",
"doom-emacs-nix": "doom-emacs-nix",
"emacs-overlay": "emacs-overlay_2",
"grocy-scanner": "grocy-scanner",
"home-manager": "home-manager",
"home-manager-utils": "home-manager-utils",
@ -1124,6 +1123,7 @@
"nixpkgs-legacy_2105": "nixpkgs-legacy_2105",
"nixpkgs-legacy_2205": "nixpkgs-legacy_2205",
"nixpkgs-legacy_2211": "nixpkgs-legacy_2211",
"nixpkgs-legacy_2305": "nixpkgs-legacy_2305",
"nixpkgs-unstable": "nixpkgs-unstable",
"overviewer": "overviewer",
"permown": "permown",
@ -1208,11 +1208,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1700362823,
"narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=",
"lastModified": 1701728052,
"narHash": "sha256-7lOMc3PtW5a55vFReBJLLLOnopsoi1W7MkjJ93jPV4E=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "49a87c6c827ccd21c225531e30745a9a6464775c",
"rev": "e91ece6d2cf5a0ae729796b8f0dedceab5107c3d",
"type": "github"
},
"original": {

26
flake.nix
View file

@ -5,28 +5,24 @@
url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main";
flake = false;
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-legacy_2305.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-legacy_2211.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";
home-manager = {
url = "github:nix-community/home-manager/release-23.05";
url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs";
};
polygon-art = {
url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
};
sops-nix.url = "github:Mic92/sops-nix";
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
flake = false;
};
doom-emacs-nix = {
url = "github:nix-community/nix-doom-emacs";
inputs.nixpkgs.follows = "nixpkgs";
#inputs.emacs-overlay.follows = "emacs-overlay";
};
home-manager-utils = {
url = "github:mrvandalo/home-manager-utils";
@ -88,7 +84,6 @@
, disko
, dns
, doom-emacs-nix
, emacs-overlay
, grocy-scanner
, home-manager
, home-manager-utils
@ -101,6 +96,7 @@
, nixpkgs-legacy_2105
, nixpkgs-legacy_2205
, nixpkgs-legacy_2211
, nixpkgs-legacy_2305
, nixpkgs-unstable
, overviewer
, permown
@ -126,6 +122,7 @@
config.allowUnfree = true;
config.permittedInsecurePackages = [
"python-2.7.18.6"
"python-2.7.18.7"
"electron-24.8.6" # for bitwarden
];
@ -135,15 +132,10 @@
inherit system;
config.allowUnfree = true;
};
legacy_2211 = import nixpkgs-legacy_2211 {
inherit system;
};
legacy_2205 = import nixpkgs-legacy_2205 {
inherit system;
};
legacy_2105 = nixpkgs-legacy_2105 {
inherit system;
};
legacy_2211 = import nixpkgs-legacy_2211 { inherit system; };
legacy_2205 = import nixpkgs-legacy_2205 { inherit system; };
legacy_2105 = nixpkgs-legacy_2105 { inherit system; };
legacy_2305 = nixpkgs-legacy_2105 { inherit system; };
polygon-art = polygon-art.packages.${system};
landingpage = landingpage.packages.${system}.plain;
trilium-server = nixpkgs-unstable.legacyPackages.${system}.trilium-server;

1
images/lib/remote-access.nix
View file

@ -18,7 +18,6 @@
}
{
# installed packages
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [
#style
most

1
images/translate-setup/config.nix
View file

@ -20,7 +20,6 @@
'';
networking.hostName = "translate";
nixpkgs.config.allowUnfree = true;
programs.bash = {
enableCompletion = true;

22
nixos/components/gui/home-manager/doom-emacs.nix
View file

@ -1,6 +1,14 @@
{ config, pkgs, lib, ... }: {
{ config, pkgs, lib, ... }:
with lib;
{
options.components.gui.emacs.enable = mkOption {
type = lib.types.bool;
default = config.components.gui.enable;
};
config = mkIf (config.components.gui.emacs.enable) {
config = lib.mkIf config.components.gui.enable {
home-manager.users.mainUser = {
programs.doom-emacs = {
enable = lib.mkDefault true;
@ -14,11 +22,11 @@
; (font-spec :family "Terminus" :size ${toString config.programs.custom.urxvt.fontSize} :weight 'light))
'';
emacsPackagesOverlay = self: super: {
# fixes https://github.com/vlaci/nix-doom-emacs/issues/394
gitignore-mode = pkgs.emacsPackages.git-modes;
gitconfig-mode = pkgs.emacsPackages.git-modes;
};
#emacsPackagesOverlay = self: super: {
# # fixes https://github.com/vlaci/nix-doom-emacs/issues/394
# gitignore-mode = pkgs.emacsPackages.git-modes;
# gitconfig-mode = pkgs.emacsPackages.git-modes;
#};
};
};
environment.systemPackages = [

11
nixos/components/terminal/zsh.nix
View file

@ -23,11 +23,12 @@ with lib;
home.shellAliases.cat = "${pkgs.bat}/bin/bat";
# a better ls
programs.exa = {
enable = true;
enableAliases = true;
};
home.shellAliases.llt = "${pkgs.exa}/bin/exa -a --tree";
# todo what's the new shit?
#programs.eza = {
# enable = true;
# enableAliases = true;
#};
home.shellAliases.llt = "${pkgs.eza}/bin/exa -a --tree";
# use z instead of cd
# use zi to fuzzy search through all registered directories

4
nixos/machines/chungus/configuration.nix
View file

@ -95,10 +95,6 @@
kernelModules = [ "e1000e" ];
};
# nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
# };
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [

6
nixos/machines/cream/configuration.nix
View file

@ -31,6 +31,8 @@
];
components.gui.enable = true;
# todo enable again
components.gui.emacs.enable = false; # because it's not working at the moment (again)
components.mainUser.enable = true;
components.media.enable = true;
components.media.tts-client.enable = false;
@ -82,7 +84,7 @@
networking.hostName = "cream";
services.flatpak.enable = true;
#services.flatpak.enable = true;
# make sure battery is charged in a way to live for a long time
services.power-profiles-daemon.enable = false;
@ -138,7 +140,7 @@
height = 1504;
};
services.xserver.desktopManager.gnome.enable = true;
#services.xserver.desktopManager.gnome.enable = true;
#services.xserver.displayManager.lightdm.enable = false;
#services.xserver.displayManager.sddm.enable = true;

9
nixos/machines/cream/packages.nix
View file

@ -63,8 +63,7 @@ in
inkscape
imagemagick
bitwig-studio3
#sononym-crawler
#bitwig-studio3
darktable
blender
@ -136,9 +135,9 @@ in
unstable.yt-dlp
unstable.terragrunt
unstable.terraform
terraform-docs
#unstable.terragrunt
#unstable.terraform
#terraform-docs
];

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

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

1
nixos/machines/dummy/configuration.nix
View file

@ -26,7 +26,6 @@
# allow un-free
# -------------
nixpkgs.config.allowUnfree = true;
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
# some system stuff

3
nixos/machines/sternchen/configuration.nix
View file

@ -73,9 +73,6 @@
driSupport = true;
driSupport32Bit = true;
};
#nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
#};
services.xserver.displayManager.defaultSession = "plasma";

3
nixos/machines/sterni/configuration.nix
View file

@ -98,8 +98,5 @@
driSupport = true;
driSupport32Bit = true;
};
#nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
#};
}

2
nixos/pkgs/default.nix
View file

@ -6,7 +6,7 @@ let callPackage = super.pkgs.callPackage;
in {
bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { };
#bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { };
emo = callPackage ./emoji { };
light-control = callPackage ./light-control { };
otpmenu = callPackage ./otpmenu { };

1
nixos/system/all/defaults.nix
View file

@ -8,7 +8,6 @@
# allow un-free
# -------------
nixpkgs.config.allowUnfree = true;
environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
# some system stuff

30
nixos/system/all/syncthing.nix
View file

@ -48,7 +48,8 @@ with lib; {
# -------------------------------
private = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/private";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = {
type = "simple";
@ -57,7 +58,8 @@ with lib; {
};
art = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/art";
devices = [ "chungus" "pepe" "cream" "sterni" "bumba" ];
versioning = {
type = "simple";
@ -66,7 +68,8 @@ with lib; {
};
books = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/books";
devices = [ "chungus" "robi" ];
versioning = {
type = "simple";
@ -75,7 +78,8 @@ with lib; {
};
password-store = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/password-store";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = {
type = "simple";
@ -84,12 +88,14 @@ with lib; {
};
desktop = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/desktop";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
};
finance = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/finance";
devices = [ "chungus" "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = {
type = "simple";
@ -98,7 +104,8 @@ with lib; {
};
fotos = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/fotos";
devices = [ "chungus" "pepe" ];
versioning = {
type = "simple";
@ -110,7 +117,8 @@ with lib; {
# ----------------------------------------
lost-fotos = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/lost-fotos";
devices = [ "chungus" "pepe" "robi" ];
versioning = {
type = "simple";
@ -125,7 +133,8 @@ with lib; {
music-projects = {
enable = lib.mkDefault false;
id = "acfhu-r4t4f";
watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/lost-fotos";
#watch = lib.mkDefault false;
devices = [ "chungus" "pepe" "cream" "sterni" "robi" ];
versioning = {
type = "simple";
@ -134,7 +143,8 @@ with lib; {
};
nextcloud_backup = {
enable = lib.mkDefault false;
watch = lib.mkDefault false;
#watch = lib.mkDefault false;
path = lib.mkDefault "/tmp/lost-fotos";
devices = [ "chungus" "pepe" "robi" ];
versioning = {
type = "simple";

2
nixos/system/desktop/packages.nix
View file

@ -245,7 +245,7 @@ in
trash-cli
nix-review
nixpkgs-review
units
hub # for github