diff --git a/flake.lock b/flake.lock index 2c609ee..8bc3c3c 100755 --- a/flake.lock +++ b/flake.lock @@ -64,6 +64,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -167,11 +185,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1779536132, - "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=", + "lastModified": 1779877693, + "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456", + "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", "type": "github" }, "original": { @@ -183,11 +201,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779102034, - "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { @@ -197,6 +215,44 @@ "type": "github" } }, + "notewrapper": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "notewrapper": "notewrapper_2" + }, + "locked": { + "lastModified": 1779896579, + "narHash": "sha256-ngPHJ7W36atwMLVQTzP4i5VlS1Lqj9nSt7mKDD6xGiw=", + "owner": "tomasriveral", + "repo": "notewrapper", + "rev": "7af79c76b1cdbbf3f516aa76a5ffe7ca169b1cfd", + "type": "github" + }, + "original": { + "owner": "tomasriveral", + "repo": "notewrapper", + "type": "github" + } + }, + "notewrapper_2": { + "flake": false, + "locked": { + "lastModified": 1779896337, + "narHash": "sha256-Xw5vkiN4ei2dkzIRXP0DLSYG8QRjQ0MLvFx2akt96kk=", + "owner": "tomasriveral", + "repo": "NoteWrapper", + "rev": "4d228fb9118f22264863716ac2d74c4ad67edbf8", + "type": "github" + }, + "original": { + "owner": "tomasriveral", + "repo": "NoteWrapper", + "type": "github" + } + }, "quickshell": { "inputs": { "nixpkgs": [ @@ -227,7 +283,23 @@ "microPlugins-vivify": "microPlugins-vivify", "nixos-grub-themes": "nixos-grub-themes", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "notewrapper": "notewrapper" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 6bb3c93..0dd2610 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + notewrapper = { + url = "github:tomasriveral/notewrapper"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; caelestia-shell = { # based on quickshell. See https://github.com/caelestia-dots/shell url = "github:caelestia-dots/shell"; diff --git a/modules/applications/browser.nix b/modules/applications/browser.nix index ceb9132..0dc2666 100644 --- a/modules/applications/browser.nix +++ b/modules/applications/browser.nix @@ -146,7 +146,7 @@ }; "uBlock0@raymondhill.net" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; + installation_mode = "blocked"; }; "{08d5243b-4236-4a27-984b-1ded22ce01c3}" = { install_url = "https://addons.mozilla.org/firefox/downloads/file/3729287/gruvboxgruvboxgruvboxgruvboxgr-1.0.xpi"; @@ -346,6 +346,36 @@ keyword = "Cogito l'Esprit critique"; url = "https://app.cogito.fr"; } + { + name = "EPFL email"; + tags = ["mail" "outlook" "epfl"]; + keyword = "EPFL email"; + url = "https://outlook.office.com/mail"; + } + { + name = "nixpkgs' failing and orphan packages"; + tags = [ "nixpkgs" "fail" "orphan" "ZH" "zero hydra failure"]; + keyword = "Zero hydra failure orphan packages"; + url = "https://zh.fail/failed/by-maintainer/_.html"; + } + { + name = "NixOS Manual - Unstable"; + tags = [ "nixos" "manual" "unstable"]; + keyword = "NixOS manual"; + url = "https://nixos.org/manual/nixos/unstable/"; + } + { + name = "Nixpgks Reference Manual - Unstable"; + tags = [ "nixpkgs" "manual" "reference" "unstable" ]; + keyword = "nixpkgs reference manual"; + url = "https://nixos.org/manual/nixpkgs/unstable/"; + } + { + name = "Nix Reference Manual - 2.34."; + tags = [ "nix" "manual" "reference" "2.34"]; + keyword = "nix reference manual"; + url = "https://nix.dev/manual/nix/2.34/nix-2.34.html"; + } ]; }; search = { diff --git a/modules/applications/notewrapper.nix b/modules/applications/notewrapper.nix new file mode 100644 index 0000000..0bb4cf0 --- /dev/null +++ b/modules/applications/notewrapper.nix @@ -0,0 +1,31 @@ +{inputs, ... }: { + flake.homeModules.notewrapper = {pkgs, ...}: { + home.packages = [ + inputs.notewrapper.packages.${pkgs.system}.default + ]; + home.file.".config/notewrapper/config.json" = { + enable = true; + force = true; + text = '' +{ + "directory": ["~/Documents/Notes/", "~/test/"], + "render": true, + "jumpToEndOfFileOnLaunch": true, + "editor": "neovim", + "journalRegex": ".*journal.*", + "dateEntry": "# %Y %m %d %a", + "newLineOnOpening": true, + "backup": { + "enable": true, + "directory": { + "~/Documents/Notes/": "~/kdrive/Notes/", + "~/test/": "~/backupTest/" + }, + "interval": "daily", + "rsyncArgs": ["-Lqah", "--update"] + } +} + ''; + }; + }; +} diff --git a/modules/applications/zsh.nix b/modules/applications/zsh.nix index 4eef1f6..c374757 100644 --- a/modules/applications/zsh.nix +++ b/modules/applications/zsh.nix @@ -35,7 +35,6 @@ } eval "$(direnv hook zsh)" eval "$(deja init zsh)" - export PATH="$PATH:$HOME/NoteWrapper" # some project im coding fastfetch''\n''; shellAliases = { ".." = "z .."; diff --git a/modules/hardware/battery.nix b/modules/hardware/battery.nix index d05338b..13e27b2 100644 --- a/modules/hardware/battery.nix +++ b/modules/hardware/battery.nix @@ -41,14 +41,14 @@ _: { CPU_BOOST_ON_BAT = 1; CPU_HWP_DYN_BOOST_ON_AC = 1; CPU_HWP_DYN_BOOST_ON_BAT = 1; - CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_AC = "balanced"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power"; - PLATFORM_PROFILE_ON_AC = "performance"; - PLATFORM_PROFILE_ON_BAT = "balanced"; - START_CHARGE_THRESH_BAT1 = 75; - STOP_CHARGE_THRESH_BAT1 = 85; + CPU_ENERGY_PERF_POLICY_ON_AC = "balanced"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave"; + PLATFORM_PROFILE_ON_AC = "balanced"; + PLATFORM_PROFILE_ON_BAT = "powersave"; + START_CHARGE_THRESH_BAT1 = 40; + STOP_CHARGE_THRESH_BAT1 = 80; }; }; # }; diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index 923d4f5..f681313 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -18,7 +18,7 @@ audioAndMedia autoCleanup-laptop autoUpdate-laptop - battery-laptop + #battery-laptop bluetooth bootloader-laptop browsers @@ -43,6 +43,7 @@ #ollama otherUtils printer + rss udev user ]; @@ -63,6 +64,7 @@ librewolf mullvad neovim + notewrapper oh-my-zsh ripgrep rofi diff --git a/modules/utilities/development.nix b/modules/utilities/development.nix index b35009b..bfca416 100644 --- a/modules/utilities/development.nix +++ b/modules/utilities/development.nix @@ -17,6 +17,7 @@ _: { ])) python313Packages.pygments # used for ccat (comment of colorize plugin from oh-my-zsh) pkg-config + nixpkgs-review gdb raylib glfw # raylib and some dependecies diff --git a/modules/utilities/otherUtils.nix b/modules/utilities/otherUtils.nix index eb34b8a..d5097ff 100644 --- a/modules/utilities/otherUtils.nix +++ b/modules/utilities/otherUtils.nix @@ -1,4 +1,4 @@ -{self, ...}: { +{self, inputs, ...}: { flake.nixosModules.otherUtils = # try to keep packages here at a minium. Preferably use a dedicated file { diff --git a/modules/utilities/rss.nix b/modules/utilities/rss.nix new file mode 100644 index 0000000..f6ca8f3 --- /dev/null +++ b/modules/utilities/rss.nix @@ -0,0 +1,7 @@ +_: { + flake.nixosModules.rss = {pkgs, ...}: { + environment.systemPackages = with pkgs; [ + nom + ]; + }; +} diff --git a/other/mullvad/settings.json b/other/mullvad/settings.json index 722a64f..cfa98d0 100644 --- a/other/mullvad/settings.json +++ b/other/mullvad/settings.json @@ -125,4 +125,4 @@ } ], "rollout_threshold_seed": null -} \ No newline at end of file +}