Compare commits

..

No commits in common. "769c2c53f1017d71700a24dc835b70aa298aa641" and "2bad479da5309940c6a7330d6446c521398f01c5" have entirely different histories.

14 changed files with 252 additions and 188 deletions

View file

@ -50,17 +50,18 @@
}, },
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1749269004, "lastModified": 1743119709,
"narHash": "sha256-20eV5kl7iP7ODy9ZNW2SAg8bIg2ttud+IWs7UHxsbE0=", "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "c579adeca940c70ac7dd661a1cda662f2d1fb158", "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -72,17 +73,17 @@
}, },
"fjordlauncher": { "fjordlauncher": {
"inputs": { "inputs": {
"flake-compat": "flake-compat",
"libnbtplusplus": "libnbtplusplus", "libnbtplusplus": "libnbtplusplus",
"nixpkgs": [ "nix-filter": "nix-filter",
"nixpkgs" "nixpkgs": "nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1747431520, "lastModified": 1742936233,
"narHash": "sha256-b1cxAw7MDEqOCX3uLpVWT8L2vRyrJJgCJR5NAdV/IXw=", "narHash": "sha256-x3DdB1SrnSLLIBpmGgXbMAnDYUajJHDYC/3rthhAsUA=",
"owner": "unmojang", "owner": "unmojang",
"repo": "FjordLauncher", "repo": "FjordLauncher",
"rev": "ae5541a3fd81e80ecb82576285d685ae6e80f52c", "rev": "808277d2f8954e2d6d19fc91723c217ffef061fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,6 +92,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -112,6 +129,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"locked": {
"lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -119,30 +151,30 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749154018, "lastModified": 1743387206,
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"hypr-contrib": { "hypr-contrib": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1747572947, "lastModified": 1743417258,
"narHash": "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4=", "narHash": "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "910dad4c5755c1735d30da10c96d9086aa2a608d", "rev": "bc2ad24e0b2e66c3e164994c4897cd94a933fd10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,7 +199,54 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1742422364,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1743315132,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1712163089, "lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
@ -183,45 +262,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1749143949,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1749086602,
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4792576cb003c994bd7cc1edada3129def20b27d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1749143949, "lastModified": 1743367904,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1743315132,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,15 +297,15 @@
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1749303967, "lastModified": 1743416833,
"narHash": "sha256-UrHaS143wyHACqs2ESD4weMCtivbq5lOktS/Luhl2XI=", "narHash": "sha256-JBz6KWbF4MFgQVpwrq7FaUsPxDN/wQEbUAUHmm1Q494=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "da271064af31c632bb26a06a16307e7ec20cbbe1", "rev": "a3f52fa7fae676916064a4b32cf306f15a79b408",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,7 +323,7 @@
"fjordlauncher": "fjordlauncher", "fjordlauncher": "fjordlauncher",
"home-manager": "home-manager", "home-manager": "home-manager",
"hypr-contrib": "hypr-contrib", "hypr-contrib": "hypr-contrib",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur" "nur": "nur"
} }

View file

@ -2,7 +2,7 @@
description = "peprolinbot's nixos configuration"; description = "peprolinbot's nixos configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -13,13 +13,10 @@
hypr-contrib.url = "github:hyprwm/contrib"; hypr-contrib.url = "github:hyprwm/contrib";
fjordlauncher = { fjordlauncher.url = "github:unmojang/FjordLauncher";
url = "github:unmojang/FjordLauncher";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -1,5 +1,15 @@
{username, ...}: { {username, ...}: {
nix.settings = { nix.settings = {
trusted-users = ["${username}"]; trusted-users = ["${username}"];
trusted-substituters = [
"https://cache.garnix.io"
"https://hyprland.cachix.org"
];
trusted-public-keys = [
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
}; };
} }

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
hardware.pulseaudio.enable = false;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;

View file

@ -18,17 +18,16 @@
force = true; force = true;
default = "FruesX"; default = "FruesX";
privateDefault = "FruesX"; privateDefault = "FruesX";
order = ["FruesX" "ddg" "google"]; order = ["FruesX" "DuckDuckGo" "Google"];
engines = { engines = {
"FruesX" = { "FruesX" = {
urls = [{template = "https://searx.peprolinbot.com/search?q={searchTerms}";}]; urls = [{template = "https://searx.peprolinbot.com/search?q={searchTerms}";}];
icon = "https://searx.peprolinbot.com/favicon.ico"; iconUpdateURL = "https://searx.peprolinbot.com/favicon.ico";
}; };
}; };
}; };
bookmarks = {};
extensions = { extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
packages = with inputs.firefox-addons.packages.${pkgs.system}; [
# ublock-origin # Included in Librewolf # ublock-origin # Included in Librewolf
bitwarden bitwarden
skip-redirect skip-redirect
@ -37,7 +36,6 @@
clearurls clearurls
hoppscotch hoppscotch
]; ];
};
bookmarks = {}; bookmarks = {};
settings = { settings = {
# Sync settings # Sync settings

View file

@ -1,7 +0,0 @@
{...}: {
services.cliphist = {
enable = true;
allowImages = true;
};
}

View file

@ -9,7 +9,6 @@
++ [(import ./browsers)] # browser configurations ++ [(import ./browsers)] # browser configurations
++ [(import ./btop.nix)] # resouces monitor ++ [(import ./btop.nix)] # resouces monitor
++ [(import ./cava.nix)] # audio visualizer ++ [(import ./cava.nix)] # audio visualizer
++ [(import ./cliphist.nix)] # clipboard
++ [(import ./discord.nix)] # discord with catppuccin theme ++ [(import ./discord.nix)] # discord with catppuccin theme
++ [(import ./gpg.nix)] # GnuPG and its agent (gpg-agent) ++ [(import ./gpg.nix)] # GnuPG and its agent (gpg-agent)
++ [(import ./fuzzel.nix)] # launcher ++ [(import ./fuzzel.nix)] # launcher

View file

@ -7,7 +7,7 @@
line-height = 25; line-height = 25;
fields = "name,generic,comment,categories,filename,keywords"; fields = "name,generic,comment,categories,filename,keywords";
terminal = "kitty"; terminal = "kitty";
prompt = "'🔍 '"; prompt = "' '";
icon-theme = "Papirus-Dark"; icon-theme = "Papirus-Dark";
layer = "top"; layer = "top";
lines = 10; lines = 10;

View file

@ -3,7 +3,7 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentry.package = pkgs.pinentry-gnome3; pinentryPackage = pkgs.pinentry-gnome3;
sshKeys = ["D2A3680589B81F2B07DA6CFE21DF848F1AF4E9D3"]; sshKeys = ["D2A3680589B81F2B07DA6CFE21DF848F1AF4E9D3"];
}; };
} }

View file

@ -4,13 +4,12 @@
... ...
}: { }: {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = with pkgs; [ home.packages = [
nerd-fonts.jetbrains-mono pkgs.nerdfonts
nerd-fonts.noto (pkgs.nerdfonts.override {fonts = ["JetBrainsMono" "Noto"];})
pkgs.twemoji-color-font
twemoji-color-font pkgs.noto-fonts-emoji
noto-fonts-emoji pkgs.roboto
roboto
]; ];
gtk = { gtk = {
@ -31,8 +30,8 @@
package = pkgs.dracula-theme; package = pkgs.dracula-theme;
}; };
cursorTheme = { cursorTheme = {
name = "mochaDark"; name = "Nordzy-cursors";
package = pkgs.catppuccin-cursors; package = pkgs.nordzy-cursor-theme;
size = 22; size = 22;
}; };
}; };

View file

@ -11,6 +11,8 @@
"poweralertd &" "poweralertd &"
"waybar &" "waybar &"
"swaync &" "swaync &"
"wl-paste --type text --watch cliphist store &" #Stores only text data
"wl-paste --type image --watch cliphist store &" #Stores only image data
"ckb-next -b &" "ckb-next -b &"
"element-desktop --hidden &" "element-desktop --hidden &"
]; ];
@ -211,7 +213,7 @@
"$mainMod, XF86MonBrightnessDown, exec, brightnessctl set 100%-" "$mainMod, XF86MonBrightnessDown, exec, brightnessctl set 100%-"
# clipboard manager # clipboard manager
"$mainMod, V, exec, cliphist list | fuzzel --dmenu --prompt '📋 ' | cliphist decode | wl-copy" "$mainMod, V, exec, cliphist list | fuzzel --dmenu | cliphist decode | wl-copy"
]; ];
# Bindings that work when locked # Bindings that work when locked

View file

@ -35,7 +35,7 @@
gtrash # rm replacement, put deleted files in system trash gtrash # rm replacement, put deleted files in system trash
imagemagick imagemagick
inkscape inkscape
kdePackages.kleopatra # Gpg GUI kleopatra # Gpg GUI
lazygit lazygit
nemo-with-extensions # file manager nemo-with-extensions # file manager
jq jq
@ -85,6 +85,7 @@
pavucontrol # pulseaudio volume controle (GUI) pavucontrol # pulseaudio volume controle (GUI)
playerctl # controller for media players playerctl # controller for media players
wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste) wl-clipboard # clipboard utils for wayland (wl-copy, wl-paste)
cliphist # clipboard manager
poweralertd poweralertd
qalculate-gtk # calculator qalculate-gtk # calculator
unzip unzip

View file

@ -3,7 +3,6 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
profiles.default = {
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
# nix language # nix language
bbenoist.nix bbenoist.nix
@ -27,7 +26,6 @@
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc-icons
]; ];
userSettings = { userSettings = {
"update.mode" = "none"; "update.mode" = "none";
"extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update "extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update
@ -96,5 +94,4 @@
} }
]; ];
}; };
};
} }

View file

@ -14,6 +14,10 @@
enable = true; enable = true;
plugins = ["git" "fzf"]; plugins = ["git" "fzf"];
}; };
initExtraFirst = ''
DISABLE_MAGIC_FUNCTIONS=true
export "MICRO_TRUECOLOR=1"
'';
shellAliases = { shellAliases = {
# record = "wf-recorder --audio=alsa_output.pci-0000_08_00.6.analog-stereo.monitor -f $HOME/Videos/$(date +'%Y%m%d%H%M%S_1.mp4')"; # record = "wf-recorder --audio=alsa_output.pci-0000_08_00.6.analog-stereo.monitor -f $HOME/Videos/$(date +'%Y%m%d%H%M%S_1.mp4')";