diff --git a/flake.lock b/flake.lock old mode 100755 new mode 100644 index 586697c..f262f02 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1779768519, - "narHash": "sha256-2n/447oNfAZrl1yncafLPgXMx5tuTF6T2B+zI/zFYkI=", + "lastModified": 1780375472, + "narHash": "sha256-Q8RAJoYlakA6B2I5DVcuxzNbhCNU1nnIjqQZYP1KGrM=", "owner": "caelestia-dots", "repo": "cli", - "rev": "64a5507e74f6c7d0c29f9131964412f8f8c4dd89", + "rev": "d1c8c8fc09738d1b40576e97c274b4a11a2e0ac7", "type": "github" }, "original": { @@ -27,17 +27,18 @@ "caelestia-shell": { "inputs": { "caelestia-cli": "caelestia-cli", + "m3shapes": "m3shapes", "nixpkgs": [ "nixpkgs-unstable" ], "quickshell": "quickshell" }, "locked": { - "lastModified": 1780196414, - "narHash": "sha256-iXmyWULTZuRd68xRL79e9GyYL9FZ6gfh6zl1PPlWX2A=", + "lastModified": 1780907625, + "narHash": "sha256-YH1LHLhoAlSmXmVz9qhY+QLFWbLVFJWSaPJ3ORr5grQ=", "owner": "caelestia-dots", "repo": "shell", - "rev": "63bb82762bb29ac9b7fcd5b97839abae721ce860", + "rev": "66a9f2f220a9cc6a29ce4b66691f0117bdd35704", "type": "github" }, "original": { @@ -53,11 +54,11 @@ ] }, "locked": { - "lastModified": 1780290312, - "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", + "lastModified": 1780894562, + "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=", "owner": "nix-community", "repo": "disko", - "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", + "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc", "type": "github" }, "original": { @@ -109,11 +110,11 @@ ] }, "locked": { - "lastModified": 1780361225, - "narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=", + "lastModified": 1780883961, + "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e28654b71096e08c019d4861ca26acb646f583d8", + "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa", "type": "github" }, "original": { @@ -138,6 +139,23 @@ "type": "github" } }, + "m3shapes": { + "flake": false, + "locked": { + "lastModified": 1777812556, + "narHash": "sha256-E5nqOucRQBWKuT31AMekmfgMywRdHgSbU86R7t4BKKA=", + "owner": "soramanew", + "repo": "m3shapes", + "rev": "356825d31f16052a782735cce264331cba0cb71b", + "type": "github" + }, + "original": { + "owner": "soramanew", + "repo": "m3shapes", + "rev": "356825d31f16052a782735cce264331cba0cb71b", + "type": "github" + } + }, "microPlugins-vivify": { "flake": false, "locked": { @@ -154,6 +172,29 @@ "url": "https://codeberg.org/gibbert/micro-vivify" } }, + "nix-git-cherry-picker": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1780928816, + "narHash": "sha256-s4wU4nfs8xsXvwPtD0yebTPaOgmtDesmEvWuKFES6cE=", + "owner": "tomasriveral", + "repo": "nix-git-cherry-picker", + "rev": "785b747ebca67f3e11b49ef5a85f9d3635bfe85d", + "type": "github" + }, + "original": { + "owner": "tomasriveral", + "repo": "nix-git-cherry-picker", + "type": "github" + } + }, "nixos-grub-themes": { "inputs": { "nixpkgs": "nixpkgs" @@ -203,6 +244,22 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1780928217, + "narHash": "sha256-Cvq31DIGCKet/UFsJd20YIwCoZmX91xQBV5oiR1bU1k=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2ef2f7e4a2999ffaab2ac987e69f5f8e29ec73cf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-notifier": { "inputs": { "flake-utils": [ @@ -228,11 +285,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1780365719, - "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", + "lastModified": 1780747962, + "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", + "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73", "type": "github" }, "original": { @@ -244,11 +301,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780453794, - "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", + "lastModified": 1780734595, + "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", + "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943", "type": "github" }, "original": { @@ -268,11 +325,11 @@ ] }, "locked": { - "lastModified": 1780404062, - "narHash": "sha256-XZziB7gcLwkhNyMoH8xDpwFktxBtzHx7zULyE4dHQfo=", + "lastModified": 1780908812, + "narHash": "sha256-syxEJP0NNgVZYHp/zRVuz32VYf+ULD9itZk7V06SCos=", "owner": "tomasriveral", "repo": "notewrapper", - "rev": "0f9ec32bfcfc4c111eaefe9e44d416afc79940ee", + "rev": "e670ef935f0dd87dc8a8c6982147a9b8dce7565e", "type": "github" }, "original": { @@ -289,11 +346,11 @@ ] }, "locked": { - "lastModified": 1779430452, - "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=", + "lastModified": 1780303737, + "narHash": "sha256-7HgdJBG4BgAPDyHKKxWtxj7nziqsQo6zQCXtwy+L9fs=", "ref": "refs/heads/master", - "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00", - "revCount": 819, + "rev": "b66495fcc5022681b56b61f928c7acbe910e722c", + "revCount": 821, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -311,8 +368,10 @@ "home-manager": "home-manager", "import-tree": "import-tree", "microPlugins-vivify": "microPlugins-vivify", + "nix-git-cherry-picker": "nix-git-cherry-picker", "nixos-grub-themes": "nixos-grub-themes", "nixpkgs": "nixpkgs_2", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-notifier": "nixpkgs-notifier", "nixpkgs-unstable": "nixpkgs-unstable", "notewrapper": "notewrapper" diff --git a/flake.nix b/flake.nix index 735da26..49139ac 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; # used with precaution as they are untested and not cached # This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone #nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme"; @@ -25,6 +26,11 @@ inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + nix-git-cherry-picker = { + url = "github:tomasriveral/nix-git-cherry-picker"; + inputs.flake-utils.follows = "flake-utils"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; caelestia-shell = { # based on quickshell. See https://github.com/caelestia-dots/shell url = "github:caelestia-dots/shell"; @@ -52,6 +58,8 @@ "hplip" "nvidia-x11" "nvidia-settings" + "steam" + "steam-unwrapped" "cheatsheet.nvim" ]; mkUnfreePredicate = pkg: @@ -65,8 +73,9 @@ pkgs-unstable = mkPkgs inputs.nixpkgs-unstable; pkgs-local = mkPkgs inputs.nixpkgs-unstable; #pkgs-local = mkPkgs inputs.nixpkgs-local; + pkgs-master = mkPkgs inputs.nixpkgs-master; in { - inherit pkgs pkgs-unstable pkgs-local; + inherit pkgs pkgs-unstable pkgs-local pkgs-master; }; } // (inputs.import-tree ./modules)); diff --git a/modules/applications/caelestia.nix b/modules/applications/caelestia.nix index ed78607..0201499 100644 --- a/modules/applications/caelestia.nix +++ b/modules/applications/caelestia.nix @@ -10,6 +10,35 @@ quickshell # we have it but adding it there solves "WARN qt.qpa.services: Failed to register with host portal QDBusError("org.freedesktop.portal.Error.Failed", "Could not register app ID: App info not found for 'org.quickshell'")" ]; }; + flake.homeModules.caelestia-desktop = _: { + # for some reason nvidia drivers or I don't know what break the lock. (activate even when use, crash, etc.) + programs.caelestia.settings.general.idle = { + lockBeforeSleep = false; + inhibitWhenAudio = true; + timeouts = []; + }; + }; + flake.homeModules.caelestia-laptop = _: { + programs.caelestia.settings.general.idle = { + lockBeforeSleep = true; + inhibitWhenAudio = true; + timeouts = [ + { + timeout = 180; + idleAction = "lock"; + } + { + timeout = 300; + idleAction = "dpms off"; # what's that? + returnAction = "dpms on"; + } + { + timeout = 600; + idleAction = ["systemctl" "suspend-then-hibernate"]; + } + ]; + }; + }; flake.homeModules.caelestia = _: let sisyphe = ../../assets/sisyphe.gif; pepe-music = ../../assets/pepe-music.gif; @@ -101,25 +130,6 @@ ]; criticalLevel = 3; }; - idle = { - lockBeforeSleep = true; - inhibitWhenAudio = true; - timeouts = [ - { - timeout = 180; - idleAction = "lock"; - } - { - timeout = 300; - idleAction = "dpms off"; # what's that? - returnAction = "dpms on"; - } - { - timeout = 600; - idleAction = ["systemctl" "suspend-then-hibernate"]; - } - ]; - }; }; background = { desktopClock = { diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index e9e25d4..3c9f9fa 100644 --- a/modules/applications/hyprland.nix +++ b/modules/applications/hyprland.nix @@ -51,7 +51,7 @@ flake.homeModules.hyprland-desktop = _: { wayland.windowManager.hyprland.settings = { monitor = [ - ", highres@highrr, auto, 1" + ", highres@highrr, auto, 0.75" ]; }; }; @@ -65,8 +65,7 @@ home.sessionVariables.NIXOS_OZONE_WL = "1"; wayland.windowManager.hyprland.plugins = [ #pkgs-unstable.hyprlandPlugins.hyprspace # currently broken - #self.packages.${pkgs-unstable.system}.hypr-dynamic-cursors-manual - #pkgs-unstable.hyprlandPlugins.hypr-dynamic-cursors # currently broken + pkgs-unstable.hyprlandPlugins.hypr-dynamic-cursors ]; wayland.windowManager.hyprland.configType = "hyprlang"; wayland.windowManager.hyprland.settings = { @@ -279,6 +278,7 @@ #"custom-obsidianbackup" # backups the obsidian notes to kdrive and to a timed hidden dir (~/.Notes.backup/) #"QS-notifycache" # builds the cache that will be used for the notification history "sleep 4 & caelestia-shell" #works better if it sleeps a bit before + "sleep 20 && ngcp pull --automatic" # see github.com/tomasriveral/nix-git-cherry-picker /* We stopped using that ######################### maybe we should desactivate those scripts # login autostart diff --git a/modules/applications/kdrive.nix b/modules/applications/kdrive.nix index 356e006..e7cac9a 100644 --- a/modules/applications/kdrive.nix +++ b/modules/applications/kdrive.nix @@ -73,7 +73,7 @@ notify-send "rclone kdrive failed" "$output" matrix-commander-rs --verbose -m "rclone kdrive failed.
Error: 
$output

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" fi ''; }; diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index 29be295..b46a235 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -7,7 +7,7 @@ flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem { #system = "x86_64-linux"; specialArgs = { - inherit (self) pkgs-unstable; + inherit (self) pkgs-unstable pkgs-master; }; modules = with self.nixosModules; [ # important do not remove @@ -27,6 +27,7 @@ documentation disk # this only installs some disk utilities. disko will format the drives fonts + games hardware-configuration-desktop hdd hyprland @@ -52,6 +53,7 @@ inputs.caelestia-shell.homeManagerModules.default anki caelestia + caelestia-desktop cursor development eza @@ -63,6 +65,7 @@ librewolf mullvad neovim + nix-git-cherry-picker-desktop notewrapper oh-my-zsh ripgrep @@ -102,7 +105,7 @@ useUserPackages = true; extraSpecialArgs = { - inherit (self) pkgs-unstable; + inherit (self) pkgs-unstable pkgs-master; inherit self; }; }; diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index df4a91d..106acb8 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -6,7 +6,7 @@ flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem { #system = "x86_64-linux"; specialArgs = { - inherit (self) pkgs-unstable pkgs-local; + inherit (self) pkgs-unstable pkgs-local pkgs-master; }; modules = with self.nixosModules; [ # important do not remove @@ -53,6 +53,7 @@ inputs.caelestia-shell.homeManagerModules.default anki caelestia + caelestia-laptop cursor development eza @@ -104,7 +105,7 @@ useUserPackages = true; extraSpecialArgs = { - inherit (self) pkgs-unstable pkgs-local; + inherit (self) pkgs-unstable pkgs-local pkgs-master; inherit self; }; }; diff --git a/modules/utilities/autoCleanup.nix b/modules/utilities/autoCleanup.nix index 9bf673d..4cd52a7 100644 --- a/modules/utilities/autoCleanup.nix +++ b/modules/utilities/autoCleanup.nix @@ -150,7 +150,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup. Everything OK.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Nix auto cleanup" "No changes" git -C "$FLAKE_DIR" push @@ -163,7 +163,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-cleanup-$TIME" fi @@ -220,7 +220,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup. Everything OK.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Nix auto cleanup" "No changes" git -C "$FLAKE_DIR" push @@ -233,7 +233,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-cleanup-$TIME" fi diff --git a/modules/utilities/autoUpdate.nix b/modules/utilities/autoUpdate.nix index 7bd8929..3c4fa78 100644 --- a/modules/utilities/autoUpdate.nix +++ b/modules/utilities/autoUpdate.nix @@ -130,7 +130,7 @@ matrix-commander-rs --verbose -m "Flake rebuild succesfull.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Flake autoupdate" "No changes" git -C "$FLAKE_DIR" push @@ -143,7 +143,7 @@ matrix-commander-rs --verbose -m "Flake rebuild failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-autoupdate-$TIME" fi @@ -191,7 +191,7 @@ matrix-commander-rs --verbose -m "Flake rebuild succesfull.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Flake autoupdate" "No changes" git -C "$FLAKE_DIR" push @@ -204,7 +204,7 @@ matrix-commander-rs --verbose -m "Flake rebuild failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-autoupdate-$TIME" fi diff --git a/modules/utilities/communicationAndNotification.nix b/modules/utilities/communicationAndNotification.nix index d210a77..a9b845e 100644 --- a/modules/utilities/communicationAndNotification.nix +++ b/modules/utilities/communicationAndNotification.nix @@ -54,7 +54,7 @@ "Set your identity\n or remove this warning by removing the custom-gitnotify line in\n ~/nixos/modules/applications/hyprland.nix" matrix-commander-rs --verbose -m "Git not configured.
Set your identify or remove this warning by removing the custom-gitnotify in ~/nixos/modules/applications/hyprland.nix
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" fi ''; }; diff --git a/modules/utilities/development.nix b/modules/utilities/development.nix index 8ed33c9..d8cec56 100644 --- a/modules/utilities/development.nix +++ b/modules/utilities/development.nix @@ -47,7 +47,7 @@ "localNotify": true, "matrix": { "enable": true, - "room": "!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU", + "room": "!BXRRokBmEdNOyYdfOF:matrix.org", "ping": true, "userPing": "@notificationbot_0000", "userPingServer": "matrix.org" diff --git a/modules/utilities/gitBackup.nix b/modules/utilities/gitBackup.nix index 25eb7c8..08f9070 100644 --- a/modules/utilities/gitBackup.nix +++ b/modules/utilities/gitBackup.nix @@ -69,7 +69,7 @@ notify-send "Git Backup Failed" "$message" matrix-commander-rs --verbose -m "Git Backup Failed: $message
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" } diff --git a/modules/utilities/nixGitCherryPicker.nix b/modules/utilities/nixGitCherryPicker.nix new file mode 100644 index 0000000..f1dc079 --- /dev/null +++ b/modules/utilities/nixGitCherryPicker.nix @@ -0,0 +1,18 @@ +{inputs, ...}: { + flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: { + home.packages = [ + inputs.nix-git-cherry-picker.packages.${pkgs.system}.default + ]; + home.file.".config/nix-git-cherry-picker/config.json" = { + enable = true; + text = '' + { + "localBranch": "desktop", + "remoteBranch": "laptop", + "nixConfigPath": "/home/tomasr/nixos/" + } + ''; + force = true; + }; + }; +} diff --git a/test b/test new file mode 100644 index 0000000..6e946b7 --- /dev/null +++ b/test @@ -0,0 +1,8 @@ +I am testing the tool ngcp i created. If this file disapears. It means I coded it wrong. + + +The problem before was that it did: +1. cherry pick +2. push + +I didn't pulled changed before cherry picking diff --git a/todo b/todo deleted file mode 100644 index 6b9bdff..0000000 --- a/todo +++ /dev/null @@ -1,59 +0,0 @@ -audacity.x86_64 -dolphin.x86_64 may be customized or nautilus cust -ollama.x86_64 -plymouth.x86_64 -quickshell.x86_64 -raylib-devel.x86_64 -some notification daemon 0.12-32.fc43 -tor.x86_64 -torbrowser-launcher.noarch -maybe configure a bit ripgrep? majuscules - -organize packages in pkgs list - -why frameworktooltui settings dont apply? - -things to do? -(maybe something periodic) deadnix and aljandra to clean up the repo - -Review windowrules when only one window - -setup lsp in neovim - -Setup obsidian (plugsins, etc.) - -setup kdrive as a git remote - -setup tampermonkey - - -with quickshell: - fix player control icons - give battery percentage - maybe modify some of the images (like the notification body) - do a full bar (no ugly empty space at top) - add brightness slider - maybe change sound icon by volume level - maybe incorpore the fast fourier transform code - - - - maybe write some notification center -- done. needs some style - - battery dashboard https://www.reddit.com/r/hyprland/comments/1rkiajd/a_beautiful_battery_system_dashboard_on_hyprland/ - - have a small terminal popup for some usages (like custom-launch) - - some meteo center with dates, etc - - show name of the app - - make the connection tray prettier? Maybe with a full rewrite - - maybe some kind of overview? - - show battery percentage - - see what people did with quickshell and take inspiration - - work on quickshell color palette to match gruvbox