Heroic moved to stable and nvtop commented out

System update
2025-01-01 16:42:41 +01:00 · 2025-01-01 16:42:05 +01:00 · 2025-01-01 12:58:44 +01:00 · 2025-01-01 12:58:36 +01:00 · 2025-01-01 12:48:58 +01:00 · 2025-01-01 12:48:41 +01:00
9 changed files with 316 additions and 71 deletions
--- a/README.md
+++ b/README.md
@ -56,6 +56,7 @@ sudo nixos-rebuild switch --flake ~/.dotfiles#kogami
 - The system consists currently from 2 profiles:
  - [Kogami](./kogami/) - My daily driver notebook
  - [Ginoza](./ginoza/) - Old notebook, only essentials installed
+  - [Tsunemori](./tsunemori/) - Phone configuration, for those moments without notebook

 ### Custom setup

--- a/TODO.md
+++ b/TODO.md
@ -20,10 +20,10 @@
 - [x] modularity connected via configuration.nix file with home manager (disable gnome, gnome configuration will be disabled too)
 - [x] NVIDIA options
 - [x] fix wlogout
+- [x] cleanup hyprland subtools (rofi, hyprlock, waybar)
+- [x] fix rofi cliboard manager by moving it into separate file managed by nix
 - [ ] neovim
 - [ ] librewolf and firefox fix, extensions and bookmarks in librewolf
- [ ] graph of my system structure
- [ ] cleanup hyprland subtools (rofi, hyprlock, waybar)
 - [ ] modularize hyprland config into multiple files
 - [ ] consider moving nh config helper into module
 - [ ] make static background folder and figure out how to simply manage backgrounds across my devices
@ -31,8 +31,12 @@
 - [ ] nix-on-droid
 - [ ] ssh public key deployment
 - [ ] consider moving userSettings from flake.nix to each profile
- [ ] fix rofi cliboard manager by moving it into separate file managed by nix
+- [ ] add grub bootloader to configuration
+- [ ] stylix make in one place and check for each program if it is enabled (tmux)
+- [ ] distinguish between profiles and decide which version of nixpkgs it should use (my notebook unstable, server stable ...)
+- [ ] check nvtop if nvidia is enabled

 - [ ] update my home page and create new web
 - [ ] fix kde theme in stylix
+- [ ] graph of my system structure
 - [ ] ?tryout starship?
--- a/flake.lock
+++ b/flake.lock
@ -128,11 +128,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1735202720,
-        "narHash": "sha256-7aEdACqT2B7nZNFjn2Y66Qucfl1AHHVFKxm4yvO0O10=",
+        "lastModified": 1735736119,
+        "narHash": "sha256-LlFTsG0yk8OZ+HjuxnpEzliG0bf+BEWLvKHQZkFtQ+U=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "fe816609e68ee1887ee89e43c9ca1aad75362477",
+        "rev": "4da6d4129925b1884cf0d1eb79ba6983abfa6933",
        "type": "gitlab"
      },
      "original": {
@ -284,11 +284,11 @@
        "zig": "zig"
      },
      "locked": {
-        "lastModified": 1735492974,
-        "narHash": "sha256-zExkl4adjfBJXG59M29nZ/Zi5H1EC4p5TNtLqjOps2I=",
+        "lastModified": 1735689283,
+        "narHash": "sha256-LOZRScnB8Q9ylmlXnt2j2v4Aj1b5JZTdSeKYaFL1RDw=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "6508fec945258f526e0adf0dcc174d954e23fb8d",
+        "rev": "60611b8a4a1d5b3c1097cce85eb0311de0696cfa",
        "type": "github"
      },
      "original": {
@ -343,11 +343,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735053786,
-        "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
+        "lastModified": 1735735907,
+        "narHash": "sha256-/AOGn9qJMjrZQyWYbObHTKmWDUP0q9+0TAXOJnq6ik0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
+        "rev": "59a4c43e9ba6db24698c112720a58a334117de83",
        "type": "github"
      },
      "original": {
@ -356,6 +356,27 @@
        "type": "github"
      }
    },
+    "home-manager-droid": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-droid"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
    "home-manager_2": {
      "inputs": {
        "nixpkgs": [
@ -453,11 +474,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1735310446,
-        "narHash": "sha256-1wUsJQ0MJBzAuQ+3c3e3OR5SW8iUF1sHco33xIcvDSg=",
+        "lastModified": 1735735636,
+        "narHash": "sha256-zSsYco2SV4zDvYDqADNEW2KFfty9maO993kRKBrigcg=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "43ca66779b7d267cc6c52bdea75d3ff8eb60132f",
+        "rev": "aff34089c4d66b951d25a0dc1867f7fb93d61a7d",
        "type": "github"
      },
      "original": {
@ -561,11 +582,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1734796073,
-        "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=",
+        "lastModified": 1735316583,
+        "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf",
+        "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8",
        "type": "github"
      },
      "original": {
@ -599,6 +620,29 @@
        "type": "github"
      }
    },
+    "nix-formatter-pack": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1705252799,
+        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "type": "github"
+      }
+    },
    "nix-ld": {
      "inputs": {
        "nixpkgs": [
@ -606,11 +650,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1734943676,
-        "narHash": "sha256-j82D0J4XkteyE/nJ+Wn+9eSdnM5RXz+1vWR3XvRN7nY=",
+        "lastModified": 1735547435,
+        "narHash": "sha256-Gf6EuiKaxINuVYfDH4NQ8+WJWHovz2SUTa3WaKS0GlI=",
        "owner": "Mic92",
        "repo": "nix-ld",
-        "rev": "76cbe0384ce6be86cba9310f617ad3abecc7f67b",
+        "rev": "2cfdb1f527f060d215ba284348e46c8678512b71",
        "type": "github"
      },
      "original": {
@ -619,13 +663,41 @@
        "type": "github"
      }
    },
+    "nix-on-droid": {
+      "inputs": {
+        "home-manager": [
+          "home-manager-droid"
+        ],
+        "nix-formatter-pack": "nix-formatter-pack",
+        "nixpkgs": [
+          "nixpkgs-droid"
+        ],
+        "nixpkgs-docs": "nixpkgs-docs",
+        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
+        "nmd": "nmd_2"
+      },
+      "locked": {
+        "lastModified": 1720396533,
+        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
+        "owner": "nix-community",
+        "repo": "nix-on-droid",
+        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1734649271,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
        "type": "github"
      },
      "original": {
@ -635,6 +707,54 @@
        "type": "github"
      }
    },
+    "nixpkgs-docs": {
+      "locked": {
+        "lastModified": 1705957679,
+        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-droid": {
+      "locked": {
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-for-bootstrap": {
+      "locked": {
+        "lastModified": 1720244366,
+        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      }
+    },
    "nixpkgs-stable": {
      "locked": {
        "lastModified": 1733423277,
@ -669,11 +789,11 @@
    },
    "nixpkgs-stable_3": {
      "locked": {
-        "lastModified": 1735141468,
-        "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=",
+        "lastModified": 1735531152,
+        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce",
+        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
        "type": "github"
      },
      "original": {
@ -699,6 +819,60 @@
        "type": "github"
      }
    },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmd_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs-docs"
+        ],
+        "scss-reset": "scss-reset"
+      },
+      "locked": {
+        "lastModified": 1705050560,
+        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
    "plasma-manager": {
      "inputs": {
        "home-manager": [
@ -752,9 +926,12 @@
        "firefox-addons": "firefox-addons",
        "ghostty": "ghostty",
        "home-manager": "home-manager",
+        "home-manager-droid": "home-manager-droid",
        "hyprland": "hyprland",
        "nix-ld": "nix-ld",
+        "nix-on-droid": "nix-on-droid",
        "nixpkgs": "nixpkgs",
+        "nixpkgs-droid": "nixpkgs-droid",
        "nixpkgs-stable": "nixpkgs-stable_3",
        "plasma-manager": "plasma-manager",
        "sops-nix": "sops-nix",
@ -762,6 +939,22 @@
        "stylix": "stylix"
      }
    },
+    "scss-reset": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631450058,
+        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
+        "type": "github"
+      },
+      "original": {
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "type": "github"
+      }
+    },
    "sops-nix": {
      "inputs": {
        "nixpkgs": [
@ -769,11 +962,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1734546875,
-        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
+        "lastModified": 1735468296,
+        "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
+        "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27",
        "type": "github"
      },
      "original": {
@ -790,11 +983,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735272951,
-        "narHash": "sha256-xGQ4qVMb8XRIpDYq+tNu3db5LzoKyAJFRl3VA0us/+M=",
+        "lastModified": 1735704986,
+        "narHash": "sha256-ExCFptQk7nPPDOopYGo3lTqXb+0Hr+vt1yG158hbCb0=",
        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "c4e2fb9a6a46acf1fd842ae33a342e71bd9a2263",
+        "rev": "11f711f1cb90f8b07ea735bd411c50b0abd850e8",
        "type": "github"
      },
      "original": {
@ -822,11 +1015,11 @@
        "tinted-tmux": "tinted-tmux"
      },
      "locked": {
-        "lastModified": 1735253599,
-        "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=",
+        "lastModified": 1735664732,
+        "narHash": "sha256-KoXLDDDT/nMBMl6VtoAGxJ58COvT+SWL5aiR+hUPBUo=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a",
+        "rev": "f48cab39ba162c5eaef3d975aaac467c20db402b",
        "type": "github"
      },
      "original": {
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+default:
+
+run:
+    git clone https://git.foglar.tech/foglar/dotfiles.git --depth 1 ~/.dotfiles
+    
--- a/kogami/home.nix
+++ b/kogami/home.nix
@ -1,4 +1,8 @@
-{userSettings, ...}: {
+{
+  userSettings,
+  pkgs,
+  ...
+}: {
  # Home manager configuration
  home.username = "${userSettings.username}";
  home.homeDirectory = "/home/${userSettings.username}";
--- a/nixos/home/apps/games.nix
+++ b/nixos/home/apps/games.nix
@ -1,5 +1,6 @@
 {
  pkgs,
+  pkgs-stable,
  lib,
  config,
  ...
@ -9,43 +10,46 @@
      lib.mkEnableOption "enable games";
  };
  config = lib.mkIf config.app_list.games.enable {
-    home.packages = with pkgs; [
-      vitetris
-      steam
-      superTuxKart
-      heroic
-      wine
+    home.packages =
+      (with pkgs; [
+        vitetris
+        steam
+        superTuxKart
+        wine

-      (writeShellScriptBin "gs" ''
-            set -xeuo pipefail
+        (writeShellScriptBin "gs" ''
+              set -xeuo pipefail

-        gamescopeArgs=(
-            --adaptive-sync # VRR support
-            --hdr-enabled
-            --mangoapp # performance overlay
-            --rt
-            --steam
-        )
-        steamArgs=(
-            -pipewire-dmabuf
-            -tenfoot
-        )
-        mangoConfig=(
-            cpu_temp
-            gpu_temp
-            ram
-            vram
-        )
-        mangoVars=(
-            MANGOHUD=1
-            MANGOHUD_CONFIG="$(IFS=,; echo "''${mangoConfig[*]}")"
-        )
+          gamescopeArgs=(
+              --adaptive-sync # VRR support
+              --hdr-enabled
+              --mangoapp # performance overlay
+              --rt
+              --steam
+          )
+          steamArgs=(
+              -pipewire-dmabuf
+              -tenfoot
+          )
+          mangoConfig=(
+              cpu_temp
+              gpu_temp
+              ram
+              vram
+          )
+          mangoVars=(
+              MANGOHUD=1
+              MANGOHUD_CONFIG="$(IFS=,; echo "''${mangoConfig[*]}")"
+          )

-        export "''${mangoVars[@]}"
-        exec gamescope "''${gamescopeArgs[@]}" -- steam "''${steamArgs[@]}"
+          export "''${mangoVars[@]}"
+          exec gamescope "''${gamescopeArgs[@]}" -- steam "''${steamArgs[@]}"

-      '')
-    ];
+        '')
+      ])
+      ++ (with pkgs-stable; [
+        heroic
+      ]);

    nixpkgs.config.allowUnfreePredicate = pkg:
      builtins.elem (lib.getName pkg) [
--- a/nixos/home/apps/terminal_tools.nix
+++ b/nixos/home/apps/terminal_tools.nix
@ -28,7 +28,7 @@
      ++ (
        if pkgs.system == "x86_64-linux"
        then [
-          nvtopPackages.full
+          #nvtopPackages.full
        ]
        else []
      );
--- a/nixos/home/packages/programming/code.nix
+++ b/nixos/home/packages/programming/code.nix
@ -77,6 +77,8 @@

          github.codespaces

+          nefrob.vscode-just-syntax
+
          # Remote
          ms-vscode-remote.remote-ssh
          ms-vscode-remote.remote-ssh-edit
--- a/tsunemori/home.nix
+++ b/tsunemori/home.nix
@ -5,5 +5,37 @@
    ../nixos/home/packages/droid-packages.nix
  ];

+  sh.bash = {
+    enable = true;
+    oh-my-posh.enable =
+      true;
+  };
+
+  sh.zsh = {
+    enable =
+      true;
+    oh-my-posh.enable =
+      true;
+  };
+
+  sh.oh-my-posh.enable = true;
+
+  program = {
+    tmux.enable = true;
+    zoxide.enable = true;
+    git.enable = true;
+    neovim.enable = true;
+  };
+
+  app_list = {
+    terminal_tools.enable = true;
+  };
+
+  programs = {
+    bat.enable = true;
+    btop.enable = true;
+    fzf.enable = true;
+  };
+
  programs.home-manager.enable = true;
 }
Author	SHA1	Message	Date
foglar	5e09533ca1	Heroic moved to stable and nvtop commented out	2025-01-01 16:42:41 +01:00
foglar	688cf330ca	System update	2025-01-01 16:42:05 +01:00
foglar	cd78413072	System update	2025-01-01 12:58:44 +01:00
foglar	70f3c7bace	test justfile added	2025-01-01 12:58:36 +01:00
foglar	971239a140	System update	2025-01-01 12:48:58 +01:00
foglar	e1f423987a	update phone package	2025-01-01 12:48:41 +01:00