update

test dedicated key for obsidian float
fix updated settings
2024-08-13 12:51:12 +02:00 · 2024-08-13 12:51:06 +02:00 · 2024-08-13 12:50:48 +02:00 · 2024-08-13 12:50:40 +02:00 · 2024-08-13 12:50:21 +02:00 · 2024-08-13 12:50:10 +02:00
9 changed files with 224 additions and 120 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+.direnv
+tmp
+result
--- a/flake.lock
+++ b/flake.lock
@ -386,18 +386,17 @@
    },
    "devshell_4": {
      "inputs": {
-        "flake-utils": "flake-utils_7",
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1717408969,
-        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
        "type": "github"
      },
      "original": {
@ -552,11 +551,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
@ -573,11 +572,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
@ -699,11 +698,11 @@
        "systems": "systems_7"
      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -760,11 +759,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720524665,
-        "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
+        "lastModified": 1723202784,
+        "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
+        "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
        "type": "github"
      },
      "original": {
@ -891,11 +890,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1721135958,
-        "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
        "type": "github"
      },
      "original": {
@ -913,11 +912,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720734513,
-        "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
        "type": "github"
      },
      "original": {
@ -988,16 +987,18 @@
        "flake-parts": "flake-parts_4",
        "niri-stable": "niri-stable",
        "niri-unstable": "niri-unstable",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "nixpkgs-stable": "nixpkgs-stable",
        "xwayland-satellite": "xwayland-satellite"
      },
      "locked": {
-        "lastModified": 1721168270,
-        "narHash": "sha256-wmFlWj5d8XcgDksIrWohKsGxiidr6YsI4qLVpDtK95U=",
+        "lastModified": 1723502033,
+        "narHash": "sha256-uMOSuLducJgrA/ICVetGkchol2IrD1L73F3DqO/73io=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "e59130f4e446a0161ac75ce031760deec6f7c5ac",
+        "rev": "0d15bcb3d07a5983377a6377582ca8f07e2f94e3",
        "type": "github"
      },
      "original": {
@ -1026,11 +1027,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1721114523,
-        "narHash": "sha256-HXUNwB2qeTNmTGX7z8JvyJAKJcDWGRsneaisSW9U1MA=",
+        "lastModified": 1722525977,
+        "narHash": "sha256-/ovhGba5HJUn8a54pd428F4fwe/1iXRVPt0TcyoY90w=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "3ace97660fde7fe1f0cc07a3925d1114af9a9c2f",
+        "rev": "908c8eb42af7a24b3fe7961b9d52c104910edcf7",
        "type": "github"
      },
      "original": {
@ -1047,11 +1048,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720845312,
-        "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
+        "lastModified": 1722924007,
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
        "type": "github"
      },
      "original": {
@ -1126,23 +1127,23 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1719876945,
-        "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
+        "lastModified": 1722555339,
+        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
      },
      "original": {
        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1720954236,
-        "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
+        "lastModified": 1722791413,
+        "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
+        "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
        "type": "github"
      },
      "original": {
@ -1154,11 +1155,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1720915306,
-        "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
+        "lastModified": 1721524707,
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
        "type": "github"
      },
      "original": {
@ -1242,27 +1243,11 @@
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1720957393,
-        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
+        "lastModified": 1723362943,
+        "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1720957393,
-        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
+        "rev": "a58bc8ad779655e790115244571758e8de055e3d",
        "type": "github"
      },
      "original": {
@ -1282,14 +1267,15 @@
        "nixpkgs": [
          "nixpkgs"
        ],
+        "nuschtosSearch": "nuschtosSearch",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1721224205,
-        "narHash": "sha256-W0+l7HNzZfEmIx/1Yp3Tow/GZILVjrMjWfTt1Mos7mI=",
+        "lastModified": 1723481641,
+        "narHash": "sha256-9djT72/Ab2E3SpUbB3l0WmqZQ5mj05+LIVoorcjCWgE=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "55bda0cc3b230255d271e5eef82f3279dae9f859",
+        "rev": "dbf6f7bc997dc3a9ab1f014ea075600357226950",
        "type": "github"
      },
      "original": {
@ -1298,6 +1284,28 @@
        "type": "github"
      }
    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils_7",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723367906,
+        "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
    "pre-commit-hooks": {
      "inputs": {
        "flake-compat": [
@ -1412,7 +1420,7 @@
        "home-manager": "home-manager",
        "lix-module": "lix-module",
        "niri": "niri",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_7",
        "nixvim": "nixvim",
        "sops-nix": "sops-nix",
        "stylix": "stylix"
@ -1426,11 +1434,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1720926522,
-        "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
+        "lastModified": 1723501126,
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
        "type": "github"
      },
      "original": {
@ -1456,11 +1464,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720818679,
-        "narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=",
+        "lastModified": 1722946882,
+        "narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "29148118cc33f08b71058e1cda7ca017f5300b51",
+        "rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e",
        "type": "github"
      },
      "original": {
@ -1582,11 +1590,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1720818892,
-        "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=",
+        "lastModified": 1723454642,
+        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f",
+        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
        "type": "github"
      },
      "original": {
@ -1598,11 +1606,11 @@
    "xwayland-satellite": {
      "flake": false,
      "locked": {
-        "lastModified": 1721167978,
-        "narHash": "sha256-0sFfLanX66bDSbIiGZP63hFiYg7pmH6ykR7wYSJ1IAk=",
+        "lastModified": 1721687061,
+        "narHash": "sha256-zk62B0tIf2SRNCeQnXxatq2gvjtaJ8xp3Hp9RB43xs0=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "054af2a1f7d2785baa25e2eb4de51d88226bed23",
+        "rev": "8892570093948de16a50e06b1a7d6890405de7a1",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -1,31 +1,41 @@
 {
-  description = "Home Manager configuration of muhh";
+  description = "muhh configs for all nix managed things";

  inputs = {
+    # nixpkgs.url = "nixpkgs/release-24.05";
    nixpkgs.url = "nixpkgs/nixos-unstable";
+
+    # hardware.url = "nixos/nixos-hardware";
+
    home-manager = {
-      # url = "github:nix-community/home-manager/release-23.11";
+      # url = "github:nix-community/home-manager/release-24.05";
      url = "github:nix-community/home-manager/master";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+
    lix-module = {
      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    
+    stylix = {
+      url = "github:danth/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+   
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
    niri = {
      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
  };

@ -33,10 +43,10 @@
    self,
    nixpkgs,
    home-manager,
-    nixvim,
+    lix-module,
    sops-nix,
    stylix,
-    lix-module,
+    nixvim,
    niri,
    ... 
  } @ inputs: let
@ -58,11 +68,12 @@
      muhhStar = lib.nixosSystem {
        inherit system;
        modules = [ 
-          inputs.sops-nix.nixosModules.sops
+          sops-nix.nixosModules.sops
          ./hosts/muhhStar.nix
        ];
      };
    };
+
    homeConfigurations = {
      muhh = home-manager.lib.homeManagerConfiguration {
        pkgs = import nixpkgs {
@ -73,10 +84,10 @@
          ];
        };
        modules = [ 
-          inputs.nixvim.homeManagerModules.nixvim 
-          inputs.sops-nix.homeManagerModules.sops
-          inputs.stylix.homeManagerModules.stylix
-          inputs.niri.homeModules.niri
+          nixvim.homeManagerModules.nixvim 
+          sops-nix.homeManagerModules.sops
+          stylix.homeManagerModules.stylix
+          niri.homeModules.niri
          ./home.nix 
        ];
      };
--- a/home.nix
+++ b/home.nix
@ -23,12 +23,14 @@
      _1password-gui
      atkinson-hyperlegible
      alacritty
+      blueman
      brightnessctl
      curl
      darktable
      ddcutil
      distrobox
      dog
+      downonspot
      fd
      ffmpegthumbnailer
      fuzzel
@ -36,6 +38,7 @@
      htop
      httpie
      just
+      libreoffice
      neovide
      (nerdfonts.override { fonts = [ "Iosevka" ]; })
      maid
@ -43,13 +46,16 @@
      mpv
      morgen
      obsidian
+      pamixer
      pavucontrol
      powertop
      qutebrowser
      rclone
+      rockbox-utility
      signal-desktop
      solargraph
      sops
+      spot
      sxiv
      steam-run
      tmux
@ -62,6 +68,7 @@
      sway-launcher-desktop
      swaynotificationcenter
      swayosd
+      vivaldi
      xdg-utils
      zellij
      zulip
@ -346,7 +353,9 @@
        toggleterm.enable = true;
        treesitter = {
          enable = true;
-          indent = true;
+          settings = {
+            indent.enable = true;
+          };
        };
      };
      extraPlugins = with pkgs.vimPlugins; [
@ -611,6 +620,7 @@
          "XF86AudioPlay" = "exec playerctl play-pause";
          "XF86AudioNext" = "exec playerctl next";
          "XF86AudioPrev" = "exec playerctl previous";
+            "${modifier}+o" = "for_window [class=obsidian] scratchpad show";
        };
        menu = "kitty --app-id launcher -e sway-launcher-desktop";
        modifier = "Mod4";
--- a/modules/common.nix
+++ b/modules/common.nix
@ -3,6 +3,17 @@
 {
  nix.settings.experimental-features = [ "nix-command" "flakes" ];

+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 30d";
+  };
+
+  nix.optimise = {
+    automatic = true;
+    dates = [ "03:45" ];
+  };
+  
  # Set your time zone.
  time.timeZone = "Europe/Berlin";

--- a/hosts/cube-hardware-configuration.nix
+++ b/hosts/cube-hardware-configuration.nix
@ -6,7 +6,7 @@
 {
  imports =
    [ (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+    ];

  boot = {
    initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
@ -20,23 +20,23 @@

  fileSystems."/" =
    { device = "/dev/disk/by-uuid/f0a69b93-3fdc-48ad-a288-a12ce1e3a205";
-    fsType = "ext4";
-  };
+      fsType = "ext4";
+    };

  fileSystems."/boot" =
    { device = "/dev/disk/by-uuid/0428-C12E";
-    fsType = "vfat";
-  };
+      fsType = "vfat";
+    };

  fileSystems."/storage/family" =
    { device = "/dev/disk/by-uuid/896c11dc-d275-4992-99e6-fddc394a7bf1";
-    fsType = "xfs";
-  };
+      fsType = "xfs";
+    };

  fileSystems."/storage/muhh" =
    { device = "/dev/disk/by-uuid/8b716713-359b-4bac-8951-a35405dccd4c";
-    fsType = "xfs";
-  };
+      fsType = "xfs";
+    };

  swapDevices = [ ];

@ -49,6 +49,17 @@
  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.i2c.enable = true;
+  hardware = {
+    cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    i2c.enable = true;
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+        };
+      };
+    };
+  };
 }
--- a/hosts/cube.nix
+++ b/hosts/cube.nix
@ -4,7 +4,7 @@
  imports =
    [ 
      ./cube-hardware-configuration.nix
-      ../modules/common.nix
+      ./common.nix
    ];

  # Bootloader.
@ -50,6 +50,7 @@
 	  alsa.enable = true;
 	  alsa.support32Bit = true;
 	  pulse.enable = true;
+    wireplumber.enable = true;
    # If you want to use JACK applications, uncomment this
    # jack.enable = true;
  };
@ -91,8 +92,6 @@
  };

  environment.shells = with pkgs; [ bash fish zsh ];
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
  environment.systemPackages = with pkgs; [
      git
      home-manager
@ -106,9 +105,6 @@
    iosevka
  ];

-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
  programs = {
    _1password.enable = true;
    _1password-gui = {
--- a/62
+++ b/62
@ -1,17 +1,71 @@
+SOPS_FILE := "./secrets/secrets.yaml"
+
 default:
  @just --list

-rebuild-pre:
+rebuild-pre: update-nix-secrets
  git add *.nix

 rebuild-post:
  just check-sops

-rebuild: rebuild
-  sudo nixos-rebuild switch --flake .#$(hostname)
+# Requires sops to be running and you must have reboot after initial rebuild
+rebuild: rebuild-pre
+  # sudo nixos-rebuild switch --flake .#$(hostname)
+  scripts/system-flake-rebuild.sh

-home_rebuild:
+# Requires sops to be running and you must have reboot after initial rebuild
+rebuild-trace: rebuild-pre && rebuild-post
+  scripts/system-flake-rebuild-trace.sh
+
+home_rebuild: rebuild-pre
  home-manager switch --flake .#muhh

 update:
  nix flake update
+
+rebuild-update: update && rebuild
+
+sops:
+  echo "Editing {{SOPS_FILE}}"
+  nix-shell -p sops --run "SOPS_AGE_KEY_FILE=~/.config/sops/age/keys.txt sops {{SOPS_FILE}}"
+
+age-key:
+  nix-shell -p age --run "age-keygen"
+
+rekey:
+  cd ../nix-secrets && (\
+    sops updatekeys -y secrets.yaml && \
+    (pre-commit run --all-files || true) && \
+    git add -u && (git commit -m "chore: rekey" || true) && git push \
+  )
+
+check-sops:
+  scripts/check-sops.sh
+
+update-nix-secrets:
+  (cd ../nix-secrets && git fetch && git rebase) || true
+  nix flake lock --update-input nix-secrets
+
+iso:
+  # If we dont remove this folder, libvirtd VM doesnt run with the new iso...
+  rm -rf result
+  nix build ./nixos-installer#nixosConfigurations.iso.config.system.build.isoImage
+
+iso-install DRIVE: iso
+  sudo dd if=$(eza --sort changed result/iso/*.iso | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync
+
+disko DRIVE PASSWORD:
+  echo "{{PASSWORD}}" > /tmp/disko-password
+  sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- \
+    --mode disko \
+    disks/btrfs-luks-impermanence-disko.nix \
+    --arg disk '"{{DRIVE}}"' \
+    --arg password '"{{PASSWORD}}"'
+  rm /tmp/disko-password
+
+sync USER HOST:
+  rsync -av --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:nix-config/
+
+sync-secrets USER HOST:
+  rsync -av --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:nix-secrets/
--- a/scripts/project-select.sh
+++ b/scripts/project-select.sh
Author	SHA1	Message	Date
Markus Heurung	c770b825a8	update	2024-08-13 12:51:12 +02:00
Markus Heurung	fe64b7ea44	test dedicated key for obsidian float	2024-08-13 12:51:06 +02:00
Markus Heurung	175aac3d14	fix updated settings	2024-08-13 12:50:48 +02:00
Markus Heurung	04b57bb22a	install some more software	2024-08-13 12:50:40 +02:00
Markus Heurung	884ee28bee	start improving justfile	2024-08-13 12:50:21 +02:00
Markus Heurung	c37a577c1c	style changes	2024-08-13 12:50:10 +02:00
Markus Heurung	0fd53b62f1	start modularization of setup	2024-08-13 12:49:24 +02:00
Markus Heurung	447d5c06b4	setup bluetooth	2024-08-13 12:48:34 +02:00
Markus Heurung	76fb213492	move script to dedicated dir	2024-08-13 12:47:01 +02:00
Markus Heurung	f09701f2a4	add gitignore	2024-07-29 16:20:24 +02:00