martials/nixos-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Grayjay, Imv, updated dependencies

Browse Source 
- Added Grayjay flake

- Added imv

- Set imv as default image viewer

- Changed catppuccin homeManagerModules to homeModules

- Media dir in home dir for media config

- pkg-config for rust development

- Removed Loupe image viewer

- Moved mpv to media dir
This commit is contained in:
Martin Berg Alstad 2025-04-02 20:09:55 +02:00
parent 542a627e23
commit 11e8f2f8c6
Signed by: martials
GPG Key ID: 706F53DD087A91DE
11 changed files with 121 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configuration.nix
View File

@ -1,11 +1,11 @@
{ {
pkgs, pkgs,
inputs,
outputs, outputs,
common,
... ...
}: }:
let
common = import ./common.nix;
in
{ {
imports = [ ./modules ]; imports = [ ./modules ];
@ -51,6 +51,7 @@ in
vlc vlc
vdhcoapp # TODO run "vdhcoapp install" on startup vdhcoapp # TODO run "vdhcoapp install" on startup
onlyoffice-desktopeditors onlyoffice-desktopeditors
inputs.grayjay.packages.${pkgs.system}.grayjay
]; ];
nix.settings.experimental-features = [ nix.settings.experimental-features = [

158
flake.lock generated
View File

@ -3,10 +3,7 @@
"ags": { "ags": {
"inputs": { "inputs": {
"astal": "astal", "astal": "astal",
"nixpkgs": [ "nixpkgs": ["hyprpanel", "nixpkgs"]
"hyprpanel",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1736090999, "lastModified": 1736090999,
@ -24,11 +21,7 @@
}, },
"astal": { "astal": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["hyprpanel", "ags", "nixpkgs"]
"hyprpanel",
"ags",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1735172721, "lastModified": 1735172721,
@ -49,11 +42,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1741424456, "lastModified": 1743414153,
"narHash": "sha256-46m7KqjSoabM5JdqP8Om9+PWioRy0uU746MZuLyw/6o=", "narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "dc7e553e91c37cec5083ac5cfaff6a28565d1334", "rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,17 +57,14 @@
}, },
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": ["nixvim", "nixpkgs"]
"nixvim",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1738453229, "lastModified": 1743550720,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,18 +91,34 @@
"type": "github" "type": "github"
} }
}, },
"home-manager": { "grayjay": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_2"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1739757849, "lastModified": 1743563044,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "narHash": "sha256-UkykPaJt9Yr8YbBg34Bnh4wE+J2sksSDFdaalfnkG6k=",
"owner": "rishabh5321",
"repo": "grayjay-flake",
"rev": "82a651064b00480042d1b7f180ca77e04ea08689",
"type": "github"
},
"original": {
"owner": "rishabh5321",
"repo": "grayjay-flake",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": ["nixpkgs"]
},
"locked": {
"lastModified": 1743387206,
"narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,7 +131,7 @@
"hyprpanel": { "hyprpanel": {
"inputs": { "inputs": {
"ags": "ags", "ags": "ags",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1740863579, "lastModified": 1740863579,
@ -143,16 +149,8 @@
}, },
"ixx": { "ixx": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": ["nixvim", "nuschtosSearch", "flake-utils"],
"nixvim", "nixpkgs": ["nixvim", "nuschtosSearch", "nixpkgs"]
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1729958008, "lastModified": 1729958008,
@ -171,11 +169,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741246872, "lastModified": 1742889210,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -187,11 +185,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1741379970, "lastModified": 1743448293,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,6 +200,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1743448293,
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
@ -217,13 +231,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1741332913, "lastModified": 1743501102,
"narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20755fa05115c84be00b04690630cb38f0a203ad", "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,13 +247,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1742288794,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,17 +266,15 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": ["nixpkgs-unstable"],
"nixpkgs-unstable"
],
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1741098523, "lastModified": 1743598191,
"narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,17 +287,14 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"ixx": "ixx", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": ["nixvim", "nixpkgs"]
"nixvim",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1738508923, "lastModified": 1743201766,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -297,9 +306,10 @@
"root": { "root": {
"inputs": { "inputs": {
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"grayjay": "grayjay",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprpanel": "hyprpanel", "hyprpanel": "hyprpanel",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
@ -308,17 +318,15 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": ["nixpkgs"],
"nixpkgs"
],
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1741493656, "lastModified": 1743595372,
"narHash": "sha256-1M2mf5pZTlhZXkSI8wKs9GfNb1hllND58zQUYSAe8EA=", "narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "a06e502c884307c33dbdf2017fd50ab3592ad868", "rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,14 +367,14 @@
}, },
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1741450391, "lastModified": 1743600524,
"narHash": "sha256-zEFEI2RWmxYS5EZTlA8VnX5X7AueDKpXF2IjJx+dyKE=", "narHash": "sha256-ZJesdL2jwCwBF4SsWvxNyGuHUv8cGLHIQwJxma6JQR0=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "6dceddfe8e1691607eaa8d9f12f33ab6a5acea82", "rev": "9818e303273448dde6ada0f7bff8b98f5ce261da",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View File

@ -24,6 +24,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
grayjay.url = "github:rishabh5321/grayjay-flake";
}; };
outputs = outputs =

2
home-manager/default-applications.nix
View File

@ -5,7 +5,7 @@
defaultApplications = defaultApplications =
let let
browser = "zen.desktop"; browser = "zen.desktop";
imageViewer = "org.gnome.Loupe.desktop"; imageViewer = "imv.desktop";
pdfReader = "org.gnome.Papers.desktop"; pdfReader = "org.gnome.Papers.desktop";
in in
{ {

4
home-manager/default.nix
View File

@ -10,7 +10,7 @@ let
in in
{ {
imports = [ imports = [
inputs.catppuccin.homeManagerModules.catppuccin inputs.catppuccin.homeModules.catppuccin
./btop.nix ./btop.nix
./cava ./cava
./cursors.nix ./cursors.nix
@ -21,7 +21,7 @@ in
./freetube.nix ./freetube.nix
./gtk.nix ./gtk.nix
./kitty.nix ./kitty.nix
./mpv.nix ./media
./nextcloud.nix ./nextcloud.nix
./rofi ./rofi
./wlogout ./wlogout

6
home-manager/media/default.nix Normal file
View File

@ -0,0 +1,6 @@
{
imports = [
./imv.nix
./mpv.nix
];
}

10
home-manager/media/imv.nix Normal file
View File

@ -0,0 +1,10 @@
{ theme, ... }:
{
catppuccin.imv = {
enable = true;
flavor = theme.flavor;
};
programs.imv.enable = true;
}

0
home-manager/mpv.nix → home-manager/media/mpv.nix
View File

1
home-manager/yazi/default.nix
View File

@ -3,7 +3,6 @@ let
batTheme = ".config/yazi/catppuccin-${theme.flavor}.tmTheme"; batTheme = ".config/yazi/catppuccin-${theme.flavor}.tmTheme";
in in
{ {
# TODO use catppuccin theme
home.file.${batTheme}.source = ./catppuccin-mocha.tmTheme; home.file.${batTheme}.source = ./catppuccin-mocha.tmTheme;
programs.yazi = { programs.yazi = {

10
modules/development/rust.nix
View File

@ -1,9 +1,17 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment = {
sessionVariables = {
# Required for some Rust dependencies, like reqwest
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
};
systemPackages = with pkgs; [
jetbrains.rust-rover jetbrains.rust-rover
rustup rustup
gcc gcc
pkg-config # Required for some Rust dependencies
]; ];
};
} }

2
modules/gnome/default.nix
View File

@ -11,7 +11,7 @@
adwaita-icon-theme adwaita-icon-theme
gnomeExtensions.appindicator gnomeExtensions.appindicator
# gnome-extension-manager # gnome-extension-manager
loupe # loupe
gnome-calculator gnome-calculator
gnome-disk-utility gnome-disk-utility
gnome-clocks gnome-clocks