From 7b5a5b7fbeee6203dad16d587853dd261a0bdeb3 Mon Sep 17 00:00:00 2001 From: Szymon P Date: Tue, 28 Apr 2026 19:07:05 +0200 Subject: [PATCH] feat: add some gui apps --- flake.lock | 60 +++++++++++++++++++++++++++++++++++++++ flake.nix | 21 +++++++++++++- modules/cli/bat.nix | 2 +- modules/cli/fastfetch.nix | 2 +- modules/cli/zoxide.nix | 2 +- modules/gui/browsers.nix | 14 ++++++++- modules/packages.nix | 25 +++++++++++++++- 7 files changed, 120 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ba445f7..15ec464 100644 --- a/flake.lock +++ b/flake.lock @@ -79,6 +79,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hyprcursor-phinger": { "inputs": { "nixpkgs": "nixpkgs" @@ -113,6 +134,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1777077449, + "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1776877367, @@ -207,8 +244,10 @@ "home-manager": "home-manager", "hyprcursor-phinger": "hyprcursor-phinger", "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", "wallpapers": "wallpapers", + "zen-browser": "zen-browser", "zut-calendar": "zut-calendar", "zutui": "zutui" } @@ -284,6 +323,27 @@ "type": "github" } }, + "zen-browser": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777356688, + "narHash": "sha256-fOhJpz7QAkBWAAih72CmnIfIN0pHfuZjhZQ/hBLNWxo=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "b3c972b3d8537a9cf7a0db96b164c9c3e580884a", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } + }, "zut-calendar": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 2f7411c..a3036d7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -15,6 +17,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # theming stuff catppuccin = { url = "github:catppuccin/nix"; @@ -42,6 +49,7 @@ outputs = { nixpkgs, + nixpkgs-stable, home-manager, catppuccin, nixvim, @@ -70,6 +78,7 @@ isNixOS = true; hostName = "default"; animations = true; + gaming = true; }; system = "x86_64-linux"; @@ -79,6 +88,16 @@ config.allowUnfree = true; }; + pkgs-stable = import nixpkgs-stable { + inherit system; + config = { + allowUnfree = true; + permittedInsecurePackages = [ + "electron-38.8.4" + ]; + }; + }; + mkHome = customConfig: let @@ -88,7 +107,7 @@ inherit pkgs; extraSpecialArgs = { - inherit inputs userConfig; + inherit inputs userConfig pkgs-stable; }; modules = [ diff --git a/modules/cli/bat.nix b/modules/cli/bat.nix index e6d74fa..111168c 100644 --- a/modules/cli/bat.nix +++ b/modules/cli/bat.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs.bat = { diff --git a/modules/cli/fastfetch.nix b/modules/cli/fastfetch.nix index 5e4844a..3fce091 100644 --- a/modules/cli/fastfetch.nix +++ b/modules/cli/fastfetch.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { programs.fastfetch = { diff --git a/modules/cli/zoxide.nix b/modules/cli/zoxide.nix index ea02c16..3f922f8 100644 --- a/modules/cli/zoxide.nix +++ b/modules/cli/zoxide.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs.zoxide = { diff --git a/modules/gui/browsers.nix b/modules/gui/browsers.nix index ba4d12b..523a41e 100644 --- a/modules/gui/browsers.nix +++ b/modules/gui/browsers.nix @@ -1,8 +1,20 @@ -{ userConfig, lib, ... }: +{ + userConfig, + pkgs, + lib, + inputs, + ... +}: { programs.chromium = { enable = true; package = lib.mkIf (!userConfig.isNixOS) null; }; + + home.packages = with pkgs; [ + inputs.zen-browser.packages."${pkgs.stdenv.hostPlatform.system}".default + tutanota-desktop + brave + ]; } diff --git a/modules/packages.nix b/modules/packages.nix index ad42d08..fc91efc 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,7 +1,17 @@ -{ pkgs, ... }: +{ pkgs, pkgs-stable, ... }: +let + rstudio-with-packages = pkgs-stable.rstudioWrapper.override { + # we use stable, because unstable is broken rn + packages = with pkgs-stable.rPackages; [ + # additional packages for rstudio here + ggplot2 + ]; + }; +in { home.packages = with pkgs; [ + # Cli stuff libnotify cliphist gh @@ -20,6 +30,19 @@ bc nh runc + + # Music + spotify + + # Gui stuff + homebank + gimp + rstudio-with-packages + + # Messaging + vesktop + signal-desktop + ]; xdg.configFile."containers/containers.conf".text = ''