Compare commits

..

No commits in common. "2f31d194306d54e25526c893858f3112d6e0011a" and "1f57a9fc529a925d25ea7f3ccf44d3f62a8c6176" have entirely different histories.

6 changed files with 56 additions and 72 deletions

84
flake.lock generated
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746065248, "lastModified": 1744234873,
"narHash": "sha256-pf0CHOIJTQllsH++29xzQzGaWUIy/976v2wAEADfDaI=", "narHash": "sha256-lQOQNEU1z4/oVBpWDjTXidMdelaafNR3jecj6n0hCIU=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "d44515cc7473e1463a8e619f7a4ac1c1b58580bd", "rev": "8f45b51942618a16e2027a67f054400a32a4b534",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745812220, "lastModified": 1745502102,
"narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=", "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d0c543d740fad42fe2c035b43c9d41127e073c78", "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746243165, "lastModified": 1745764360,
"narHash": "sha256-DQycVmlyLQNLjLJ/FzpokVmbxGQ8HjQQ4zN4nyq2vII=", "narHash": "sha256-GJEUJpZLkczMN6HXD0wdFX6KyDbvZe3v5orUhqEfK6w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c0962eeeabfb8127713f859ec8a5f0e86dead0f2", "rev": "50bb714a8259b0c29b6c3429099a3b837771dab4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746040799, "lastModified": 1745439012,
"narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", "narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f217e5a319f6c186283b530f8c975e66c028433", "rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,11 +478,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1746230955, "lastModified": 1744597985,
"narHash": "sha256-X32sM3RQ3X2y6PzfNnX3rhUAlhuITdDOdfSrwZXjlsQ=", "narHash": "sha256-lLYB9/tQ0OAKonL0Ku963nqOm0aE1TmLavrzmXAr5Zc=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "2a1678ba8e4807bd855dd0da94ea2bef5bca733d", "rev": "cbdcbb5f8eb24e25b932bbc87e29299a72e34b64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -584,11 +584,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1746282617, "lastModified": 1745768022,
"narHash": "sha256-UzqYxLJbt8zWdW5a7qVO4gCWEQySil0oXawIlJjctK4=", "narHash": "sha256-MI2gEUT4xlnKE0pUJ/WmW6ML3IFiqGRD6Fize/SiY7M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd04914cf9caebd3572838a6d1078dade8300037", "rev": "488d37d95bb5de4ad38cbd647e792574b7147800",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,11 +600,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746183838, "lastModified": 1745487689,
"narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bf3287dac860542719fe7554e21e686108716879", "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -616,11 +616,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1746141548, "lastModified": 1745526057,
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -632,11 +632,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1746141548, "lastModified": 1745526057,
"narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -648,11 +648,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1745234285,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +669,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1746277541, "lastModified": 1745771698,
"narHash": "sha256-s4tgQNomZhgero1ALP7SwNIagbT7yOnKVvjqcq2qxFY=", "narHash": "sha256-1/87FqzayivqtFS/yFqHNBsSlY3hP6CTcsq8Wj9qDrI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "7d89a2092973370db813fe87ab45d7bb5c4e1edd", "rev": "f33c7bc8d22cbbc2fa932e283746eacd05944b17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -692,11 +692,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1746056780, "lastModified": 1745459908,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167", "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,11 +717,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1746251508, "lastModified": 1745724418,
"narHash": "sha256-AOvwSvFmcQ+N9554XxGDhYBL1DigrJeau5Mz9muvF54=", "narHash": "sha256-OBzNjF+ul741p5pfl1Ym2lE7psr0QF/QjOGRLpCpz+0=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "f7c35ab3422b35f3af422f4f896bd79a9ba30ee4", "rev": "bb3ca63d21cd05c197e2df9da6ee2c7eaa8e7672",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -880,11 +880,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1746223791, "lastModified": 1745618823,
"narHash": "sha256-R/DWYbY+Yr/QULujNlozfBUU2s9nZPoRikjIGPTYcR8=", "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "953e7247ac340e5036f8af47eaccf1a23f1a0257", "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,6 +1,11 @@
{pkgs, ...}: { {
programs.floorp = { config,
pkgs,
...
}: {
programs.firefox = {
enable = true; enable = true;
# package = pkgs.librewolf;
profiles.blue = { profiles.blue = {
isDefault = true; isDefault = true;
id = 0; id = 0;
@ -21,8 +26,8 @@
shinigami-eyes shinigami-eyes
]; ];
search = { search = {
# default = "ddg"; # Set search engine to DuckDuckGo default = "ddg"; # Set search engine to DuckDuckGo
# force = true; # Prevents annoying error when rebuilding force = true; # Prevents annoying error when rebuilding
}; };
settings = { settings = {
"browser.search.region" = "GB"; "browser.search.region" = "GB";
@ -40,8 +45,6 @@
"DisablePocket" = true; "DisablePocket" = true;
"AutofillAddressEnabled" = false; "AutofillAddressEnabled" = false;
"AutofillCreditCardEnabled" = false; "AutofillCreditCardEnabled" = false;
"DisableFirefoxAccounts" = true;
"PasswordManagerEnabled" = false;
}; };
}; };
} }

View file

@ -21,7 +21,6 @@
./stylix.nix ./stylix.nix
./direnv.nix ./direnv.nix
./firefox.nix ./firefox.nix
./zellij.nix
]; ];
# States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed
@ -64,7 +63,6 @@
# Set default editor # Set default editor
EDITOR = "nvim"; EDITOR = "nvim";
NIXOS_OZONE_WL = 1; NIXOS_OZONE_WL = 1;
LD_LIBRARY_PATH = "${pkgs.libGL}/lib:${pkgs.gtk3}/lib:${pkgs.glib.out}/lib:${pkgs.xorg.libXtst}/lib";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.

View file

@ -5,9 +5,6 @@
xwayland.enable = true; xwayland.enable = true;
systemd.variables = ["--all"]; systemd.variables = ["--all"];
settings = { settings = {
misc = {
enable_anr_dialog = false;
};
# Monitor config for home desk layout # Monitor config for home desk layout
monitor = [ monitor = [
"eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
@ -16,8 +13,6 @@
]; ];
workspace = [ workspace = [
"name:comms, monitor:desc:Lenovo Group Limited LEN G24-10 U5B4KL78, default:true" "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"
]; ];
# Define SUPER key as mod key # Define SUPER key as mod key
@ -43,13 +38,9 @@
]; ];
exec-once = [ exec-once = [
"[workspace name:comms silent; move -100%,100%] telegram-desktop" "[workspace name:comms silent; move -100%,100%] telegram-desktop"
"[workspace name:comms silent; move -100%,-100%] signal-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland" "[workspace name:comms silent; move -100%,-100%] signal-desktop"
"[workspace name:comms silent; move 100%,100%] floorp https://web.whatsapp.com https://instagram.com" "[workspace name:comms silent; move 100%,100%] firefox https://web.whatsapp.com https://instagram.com"
"[workspace name:comms silent; move 100%,-100%] vesktop" "[workspace name:comms silent; move 100%,-100%] vesktop"
"[workspace name:bg_noise] floorp https://www.youtube.com/playlist?list=WL"
"[workspace name:main] alacritty"
]; ];
# Declare all keybinds # Declare all keybinds
@ -57,9 +48,9 @@
# Keybind for setting fullscreen # Keybind for setting fullscreen
"$mod, F11, fullscreen" "$mod, F11, fullscreen"
# Keybinds for starting programs # Keybinds for starting programs
"$mod, F, exec, floorp" "$mod, F, exec, firefox"
"$mod, 1, exec, alacritty" "$mod, 1, exec, alacritty"
"$mod, D, exec, vesktop" "$mod, D, exec, vesktop --enable-features=UseOzonePlatform --ozone-platform=wayland"
"$mod, space, exec, zsh -c 'wofi --show drun, run'" "$mod, space, exec, zsh -c 'wofi --show drun, run'"
# Screenshot tool # Screenshot tool

View file

@ -31,7 +31,7 @@
}; };
polarity = "dark"; polarity = "dark";
targets = { targets = {
floorp.profileNames = ["blue"]; firefox.profileNames = ["blue"];
}; };
}; };
} }

View file

@ -1,8 +0,0 @@
{...}: {
programs.zellij = {
enable = true;
enableZshIntegration = true;
exitShellOnExit = true;
attachExistingSession = true;
};
}