From 00bebbe34ad83a915036fd9d45a58d5783132af1 Mon Sep 17 00:00:00 2001 From: ant Date: Mon, 8 Dec 2025 15:20:50 +0100 Subject: [PATCH 1/2] basado: set resolution --- home/basado.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/basado.nix b/home/basado.nix index 4da42df..ea9b7fb 100644 --- a/home/basado.nix +++ b/home/basado.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { wayland.windowManager.hyprland = { extraConfig = '' - monitor=,highrr,auto,1 + monitor=,3440x1440@100,auto,1 ''; }; From d03af49808cf364b257c8942bddd160dc6bd7ef8 Mon Sep 17 00:00:00 2001 From: ant Date: Thu, 27 Nov 2025 18:39:56 +0100 Subject: [PATCH 2/2] port to 25.11 UNFINISHED --- flake.lock | 51 +++++++++++---------------------- flake.nix | 8 +++--- home/base.nix | 18 +++++++----- home/bin/runmenu | 1 - home/bin/screenshot.nix | 4 +-- home/gui-software.nix | 2 +- home/hyprland.nix | 6 +--- home/ui.nix | 56 +++++++++++++++++++++++++++++++++++-- os/basado/configuration.nix | 6 ++-- os/common-graphics.nix | 9 +----- os/forgejo.nix | 2 +- os/ks/configuration.nix | 1 + os/moon/configuration.nix | 2 -- 13 files changed, 95 insertions(+), 71 deletions(-) delete mode 100755 home/bin/runmenu diff --git a/flake.lock b/flake.lock index 69b3722..c4ca65a 100644 --- a/flake.lock +++ b/flake.lock @@ -123,16 +123,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764177491, + "narHash": "sha256-dhX2abFWxeXab3Aad4Pg1xGtn9W84/qetNXfmYUwktw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "2217780c39169a9c77915200137550c2ef0fa974", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -160,48 +160,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1764192966, + "narHash": "sha256-gGwJNJTb4p90y3VG0QbgnpCi6RFm0p+QFMp+jGqXj+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "dcab162b6c4416f205dfb8c3603c76f2245644e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11-small", "repo": "nixpkgs", "type": "github" } @@ -237,20 +221,19 @@ "blobs": "blobs", "flake-compat": "flake-compat", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_2", - "nixpkgs-25_05": "nixpkgs-25_05" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1755110674, - "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", + "lastModified": 1764185122, + "narHash": "sha256-+HUOwSIFLoyett2cvRjuFIbhobpHallfP9J2cia1apo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "f5936247dbdb8501221978562ab0b302dd75456c", + "rev": "a14fe3b293ec2720e5b7fc72ad136d22967e12ba", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixos-mailserver", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index d6aa1fa..ecaf906 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Configuration for my homes & OSs"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nixgl = { @@ -13,7 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; st-flexipatch.url = "https://git.antoinevaure.fr/ant/st-flexipatch/archive/master.zip"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11"; }; outputs = @@ -97,7 +97,7 @@ nixosConfigurations.hs = osConfig "hs"; nixosConfigurations.ks = osConfig "ks"; - build-all = pkgs.runCommandNoCC "build-all" { + build-all = pkgs.runCommand "build-all" { buildInputs = let osDerivation = name: self.nixosConfigurations.${name}.config.system.build.toplevel; in let homeDerivation = name: self.homeConfigurations.${name}.activationPackage; in diff --git a/home/base.nix b/home/base.nix index c23b4f2..92bec9d 100644 --- a/home/base.nix +++ b/home/base.nix @@ -69,14 +69,18 @@ programs.git = { enable = true; - aliases = { - co = "checkout"; + settings = { + aliases = { + co = "checkout"; + }; + extraConfig = { + pull.rebase = true; + }; + user = { + name = config.home.username; + email = "${config.home.username}@domain.xyz"; + }; }; - extraConfig = { - pull.rebase = true; - }; - userName = config.home.username; - userEmail = "${config.home.username}@domain.xyz"; }; programs.direnv = { diff --git a/home/bin/runmenu b/home/bin/runmenu deleted file mode 100755 index 0a1cf11..0000000 --- a/home/bin/runmenu +++ /dev/null @@ -1 +0,0 @@ -${pkgs.rofi-wayland}/bin/rofi -matching normal -sort -show run diff --git a/home/bin/screenshot.nix b/home/bin/screenshot.nix index c38dae9..9447064 100755 --- a/home/bin/screenshot.nix +++ b/home/bin/screenshot.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: pkgs.writers.writePython3 "screenshot" { flakeIgnore = [ "E501" ];} '' import subprocess import re @@ -13,7 +13,7 @@ full screen viewer """ -cmd = '${pkgs.rofi-wayland}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"' +cmd = '${config.programs.rofi.package}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"' result = subprocess.run(cmd, input=options, stdout=subprocess.PIPE, diff --git a/home/gui-software.nix b/home/gui-software.nix index 5c46b80..022aa15 100644 --- a/home/gui-software.nix +++ b/home/gui-software.nix @@ -9,7 +9,7 @@ libreoffice keepassxc thunderbird - vieb + # vieb gimp signal-desktop open-in-mpv diff --git a/home/hyprland.nix b/home/hyprland.nix index bbe08ca..6f53bea 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -61,7 +61,7 @@ animations = { enabled = true; - bezier = "myBezier, 0, 0, .58, 1"; + bezier = "myBezier, 0, 0, 0.58, 1"; animation = "global, 1, 1, myBezier"; }; @@ -72,10 +72,6 @@ # no_gaps_when_only = true; }; - gestures = { - workspace_swipe = "off"; - }; - misc = { enable_anr_dialog = false; disable_hyprland_logo = true; diff --git a/home/ui.nix b/home/ui.nix index ebc0fbd..3ebe7b4 100644 --- a/home/ui.nix +++ b/home/ui.nix @@ -30,7 +30,7 @@ in nerd-fonts.caskaydia-cove cascadia-code inter - emojione + joypixels bluetuith keepmenu @@ -54,6 +54,12 @@ in }) ]; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "joypixels" + ]; + nixpkgs.config.joypixels.acceptLicense = true; + home.file = { ".config/kitty/light.conf".source = dotfiles/kitty/light.conf; ".config/kitty/dark.conf".source = dotfiles/kitty/dark.conf; @@ -87,7 +93,52 @@ in subprocess.call(cmd, shell=True) ''; - ".bin/screenshot".source = (import ./bin/screenshot.nix) pkgs; + ".bin/screenshot".source = pkgs.writers.writePython3 "screenshot" { flakeIgnore = [ "E501" ];} '' + import subprocess + import re + + options = """\ + a selected area (copy) + current window (copy) + full screen (copy) + a selected area + current window + full screen + viewer + """ + + cmd = '${config.programs.rofi.package}/bin/rofi -dmenu -location 2 -l 7 -i -p "Screenshot which area?"' + result = subprocess.run(cmd, + input=options, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + shell=True, + text=True) + + if result.returncode != 0: + exit(1) + + choice = result.stdout.strip() + cmd = "${pkgs.pkgs.sway-contrib.grimshot}/bin/grimshot " + if choice == "viewer": + filename = subprocess.getoutput("mktemp") + cmd += f"save area {filename}" + else: + cmd += "copy " if re.match(".*(copy)", choice) else "save " + + for k, v in {"a selected area.*": "area ", + "current window.*": "active ", + "current screen.*": "output ", + "all screens.*": "screen "}.items(): + if re.match(k, choice): + cmd += v + + subprocess.call(cmd, + shell=True) + + if choice == "viewer": + subprocess.run(f"nsxiv -b {filename}", shell=True) + ''; ".bin/ocrzone".source = pkgs.writers.writeBash "ocrzone" '' ${pkgs.pkgs.sway-contrib.grimshot}/bin/grimshot save area - | \ @@ -299,7 +350,6 @@ in programs.rofi = { enable = true; - package = pkgs.rofi-wayland; plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ]; theme = "theme.rasi"; }; diff --git a/os/basado/configuration.nix b/os/basado/configuration.nix index fb96c85..8249e45 100644 --- a/os/basado/configuration.nix +++ b/os/basado/configuration.nix @@ -104,9 +104,9 @@ in # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.05"; # Did you read the comment? - services.udev.packages = [ - pkgs.android-udev-rules - ]; + # services.udev.packages = [ + # pkgs.android-udev-rules + # ]; nix.distributedBuilds = true; nix.settings.builders-use-substitutes = true; diff --git a/os/common-graphics.nix b/os/common-graphics.nix index 4544144..1ba582a 100644 --- a/os/common-graphics.nix +++ b/os/common-graphics.nix @@ -13,15 +13,8 @@ enable = false; user = "ant"; }; - sddm = { + ly = { enable = true; - wayland.enable = true; - package = pkgs.kdePackages.sddm; - extraPackages = with pkgs; [ - where-is-my-sddm-theme - kdePackages.qt5compat - ]; - theme = "where_is_my_sddm_theme"; }; }; diff --git a/os/forgejo.nix b/os/forgejo.nix index 1883fda..f414d15 100644 --- a/os/forgejo.nix +++ b/os/forgejo.nix @@ -53,7 +53,7 @@ let utils = import ./utils.nix; in }; services.gitea-actions-runner = { - package = pkgs.forgejo-actions-runner; + package = pkgs.forgejo-runner; instances.default = { enable = true; name = "monolith"; diff --git a/os/ks/configuration.nix b/os/ks/configuration.nix index afa2af2..cfbc689 100644 --- a/os/ks/configuration.nix +++ b/os/ks/configuration.nix @@ -50,6 +50,7 @@ in { }; mailserver = { + stateVersion = 1; enable = true; fqdn = "mail.${domain}"; domains = [ domain domainAlex ]; diff --git a/os/moon/configuration.nix b/os/moon/configuration.nix index cbe7e4f..ab69bd8 100644 --- a/os/moon/configuration.nix +++ b/os/moon/configuration.nix @@ -18,8 +18,6 @@ services.xserver.videoDrivers = [ "amdgpu" ]; hardware.graphics = { enable = true; - extraPackages = [ pkgs.amdvlk ]; - extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; }; programs.steam.enable = true;