From 780341039777831963e6904374ab1ddb6f991bd1 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Tue, 27 May 2025 01:28:52 +0100 Subject: [PATCH 1/5] replace cat with bat (aliased) --- home-manager/home.nix | 1 + home-manager/zsh.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 7483e70..8c2c4ac 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -43,6 +43,7 @@ pavucontrol # Useful audio control GUI stable.prismlauncher # Minecraft launcher virt-manager # QEMU manager + bat # cat but with syntax highlighting # Audio Plugins calf diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index 5485107..a8844c6 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -15,6 +15,7 @@ ip = "ip --color=auto"; nano = "nvim"; cd = "z"; + cat = "bat"; # Aliases for my nixos workflow switch = "sudo nixos-rebuild switch --flake ~/nixconf |& nom"; From 86e1c3f9a94f3748bac6f814124e920cb4dc9267 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Wed, 28 May 2025 17:21:16 +0100 Subject: [PATCH 2/5] added bc to home.packages --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 8c2c4ac..d877d3b 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -44,6 +44,7 @@ stable.prismlauncher # Minecraft launcher virt-manager # QEMU manager bat # cat but with syntax highlighting + bc # terminal calculator # Audio Plugins calf From e1d24869fb66345342b71f1c3720811d2fa8102c Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sat, 31 May 2025 17:02:56 +0100 Subject: [PATCH 3/5] made specified workspaces persistent --- home-manager/hyprland.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index b5392ea..ae0d311 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -15,9 +15,9 @@ "desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, 1920x1080@119.98, 960x-1080, auto" # right external monitor ]; workspace = [ - "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true" - "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true" - "name:main, monitor:eDP-2, default:true" + "name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true, persistent:true" + "name:bg_noise, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4ZAM2, default:true, persistent:true" + "name:main, monitor:eDP-2, default:true, persistent:true" ]; # Define SUPER key as mod key From 1aa38d8e7794b07f0458f244f9de8cc8c76ca372 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Mon, 2 Jun 2025 13:52:46 +0100 Subject: [PATCH 4/5] update flake --- flake.lock | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 14619d3..36841a2 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -110,11 +110,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1748832438, + "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "flake-compat_3": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1748227609, - "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "mnw": { "locked": { - "lastModified": 1747499976, - "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", + "lastModified": 1748278309, + "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", "owner": "Gerg-L", "repo": "mnw", - "rev": "72433a144c4ac16931e9148f78db4a0e4c147441", + "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1748296380, - "narHash": "sha256-1QJCz5NzR/KLRpvk8aIUkfPV6ONwmtEdfIrHI26CPQk=", + "lastModified": 1748867139, + "narHash": "sha256-5tgvCRN9GT9DoVfKEYco+OTRmkPStOgu2uZV8+DLNN8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c00e8f75283bf91e5bfb2939ab9aa876e2cf461", + "rev": "a09d57a6634396ca52fe3a951ba8e824d2fe2b2d", "type": "github" }, "original": { @@ -578,11 +578,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748162331, - "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { @@ -594,11 +594,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -610,11 +610,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748298368, - "narHash": "sha256-Scj64M2Osd26kGMjwgZjw7q+0tc7yhIJrh8Fw9tZ+RU=", + "lastModified": 1748864791, + "narHash": "sha256-YRRRbOEc8aXpzSvN3qdIkqtVQ9xjx9rgichtaSQ0qwY=", "owner": "nix-community", "repo": "NUR", - "rev": "d284a1082be198da8fc5b1a5c0d84881974d9821", + "rev": "4ee0c2599266fb26e6ac3cb71836e96f25df446e", "type": "github" }, "original": { @@ -657,11 +657,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -682,11 +682,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748298067, - "narHash": "sha256-vBwOZ4wwy30Qbik6dPP4m/k+g3z6R2eL26vhPi4tKzA=", + "lastModified": 1748651104, + "narHash": "sha256-GZLiCQlNV8QfAWwGinXeSdiKZS346ZGPv6EKzeY0tAA=", "owner": "notashelf", "repo": "nvf", - "rev": "b45f0516a12202c602e080debef926be8a0ebab6", + "rev": "c4cf91d4b531245a02f5b6c196f6279bc87a546f", "type": "github" }, "original": { @@ -847,11 +847,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748276618, - "narHash": "sha256-reC7nvUfJMaIYJb5pVOuTFbOfj/L9eo21drj+9EbrkE=", + "lastModified": 1748803004, + "narHash": "sha256-dLGywKYxge3rzD6AqtVP0UmMHONdQNCWXj6i0lfm/UM=", "owner": "nix-community", "repo": "stylix", - "rev": "1fdbf01ebe4b7838aa3d95334325ce8445625332", + "rev": "5f841056ca60bea7312aeade957da084cd95b26e", "type": "github" }, "original": { @@ -941,11 +941,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -957,11 +957,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { From 75f7f38f2965692f15cf03d196702052978aac2f Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Mon, 2 Jun 2025 17:21:36 +0100 Subject: [PATCH 5/5] moved obs-studio to home-manager module also installed obs-pipewire-audio-capture using the home-manager module --- home-manager/home.nix | 1 + home-manager/obs-studio.nix | 8 ++++++++ modules/packages.nix | 1 - 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 home-manager/obs-studio.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index d877d3b..3b03b9a 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -20,6 +20,7 @@ ./direnv.nix ./firefox.nix ./zellij.nix + ./obs-studio.nix ]; home.stateVersion = "24.05"; diff --git a/home-manager/obs-studio.nix b/home-manager/obs-studio.nix new file mode 100644 index 0000000..5ffba50 --- /dev/null +++ b/home-manager/obs-studio.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + obs-pipewire-audio-capture + ]; + }; +} diff --git a/modules/packages.nix b/modules/packages.nix index bd3882c..9a7d90f 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -25,7 +25,6 @@ wineWowPackages.waylandFull vlc protonmail-bridge - obs-studio pciutils vial qmk