punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: punkfairie:da60df353f8f6fac70ee1e00869fdbd4f8e4469d
Branches Tags
punkfairie:main
punkfairie:snowfallorg
...
compare: punkfairie:5f0f9d4387de1a35a5707b90856bd321f2e314d7
Branches Tags
punkfairie:main
punkfairie:snowfallorg

7 commits
da60df353f ... 5f0f9d4387

Author SHA1 Message Date
punkfairie
5f0f9d4387
feat: superfile 2025-04-06 12:39:39 -07:00
punkfairie
01b885f69b
feat: lazydocker 2025-04-06 12:35:53 -07:00
punkfairie
b3921a3dee
feat: httpie 2025-04-06 12:35:40 -07:00
punkfairie
02685dc85d
chore: update 2025-04-06 12:17:05 -07:00
punkfairie
ec05a6d342
fix: undo niri fixing 2025-04-06 12:17:00 -07:00
punkfairie
d41728d9b3
fix: undo stylix fixing 2025-04-06 12:16:42 -07:00
punkfairie
2c803d9685
feat: jqp 2025-04-06 11:38:51 -07:00
13 changed files with 240 additions and 132 deletions
Show stats Expand all files Collapse all files

151
flake.lock
View file

@ -132,11 +132,11 @@
]
},
"locked": {
"lastModified": 1741126078,
"narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
"lastModified": 1743127615,
"narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "c172f50b55b087f8e7801631de977461603bb976",
"rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
"type": "github"
},
"original": {
@ -171,11 +171,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1741628778,
"narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
"lastModified": 1743774811,
"narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
"rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
"type": "github"
},
"original": {
@ -587,11 +587,11 @@
]
},
"locked": {
"lastModified": 1741379162,
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github"
},
"original": {
@ -732,11 +732,11 @@
]
},
"locked": {
"lastModified": 1742234739,
"narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
"lastModified": 1743808813,
"narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
"rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
"type": "github"
},
"original": {
@ -754,11 +754,11 @@
]
},
"locked": {
"lastModified": 1739757849,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"lastModified": 1743808813,
"narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
"type": "github"
},
"original": {
@ -911,11 +911,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1742305115,
"narHash": "sha256-EJu/9UNo8ndiZ7AUVTazWQOA4lHUaTkorvgVExo2LLs=",
"lastModified": 1743943715,
"narHash": "sha256-9xCTf79Naq7mxvqtjgbcU9ZlNwubAep0qlwrL3GqZQQ=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "bc4f3a4d3d0fb9be399faf525caffd5b664c5d31",
"rev": "f53eac2ea3c72dd4e9739228660f661eb27359d0",
"type": "github"
},
"original": {
@ -944,11 +944,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1742276600,
"narHash": "sha256-muceB5DW++WPqrGKpX3Hkii/DNSMmFs2oQrYRYHmPiU=",
"lastModified": 1743923080,
"narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "e251ca7340bc71870c3a81a7ffc3d9bde58e685a",
"rev": "430b155929a60644ea223012ee0c1389fc5e3755",
"type": "github"
},
"original": {
@ -1017,11 +1017,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1742251239,
"narHash": "sha256-QH61lUWvO7jkZAzsgBJtyjmX5/UozZcSZQxOl10jVk4=",
"lastModified": 1743833482,
"narHash": "sha256-tUV7MhS/JFOEp3JQxiyvo8K3aS5zP5jcF/Buk57yWDo=",
"owner": "kaylorben",
"repo": "nixcord",
"rev": "d7f44d000158fa46af9fae1819d8221d1ccb4ca2",
"rev": "2903d897d5939324a758bd3f2cee1fbcb118b5d1",
"type": "github"
},
"original": {
@ -1069,27 +1069,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1742268799,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"lastModified": 1743813633,
"narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da044451c6a70518db5b730fe277b70f494188f1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1741600792,
"narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ebe2788eafd539477f83775ef93c3c7e244421d3",
"rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
"type": "github"
},
"original": {
@ -1165,11 +1149,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1742069588,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"lastModified": 1743827369,
"narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"rev": "42a1c966be226125b48c384171c44c651c236c22",
"type": "github"
},
"original": {
@ -1181,11 +1165,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1742169275,
"narHash": "sha256-nkH2Edu9rClcsQp2PYBe8E6fp8LDPi2uDBQ6wyMdeXI=",
"lastModified": 1742800061,
"narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d9b5431f967007b3952c057fc92af49a4c5f3b2",
"rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
"type": "github"
},
"original": {
@ -1197,31 +1181,31 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1735554305,
"narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
"lastModified": 1743813633,
"narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
"rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1742268799,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"owner": "nixos",
"lastModified": 1743703532,
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da044451c6a70518db5b730fe277b70f494188f1",
"rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
@ -1236,11 +1220,11 @@
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1742354265,
"narHash": "sha256-6mkvo9t0E6N8C+PaFOAj9dVwO67EMB1cBsYTuptmMFQ=",
"lastModified": 1743955979,
"narHash": "sha256-MKzkAPxM5fTkoxJwKI674clfrB9xcWuGjXa0GlH3zGk=",
"owner": "nix-community",
"repo": "NUR",
"rev": "55a501ea9d91bf88423e9e7f526372c0d6b1c23f",
"rev": "a6e3e07ea35a0930c7889400d5bf5a40592eda1e",
"type": "github"
},
"original": {
@ -1323,7 +1307,7 @@
"niri-flake": "niri-flake",
"nixcord": "nixcord",
"nixgl": "nixgl",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_8",
"nur": "nur",
"snowfall-lib": "snowfall-lib",
"stylix": "stylix",
@ -1386,18 +1370,18 @@
"git-hooks": "git-hooks_3",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_10",
"nixpkgs": "nixpkgs_9",
"systems": "systems_5",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1741961698,
"narHash": "sha256-utsgC6H3ja6sLAXMd8//I2D7yjyScFqVDRX0wpbqPZo=",
"lastModified": 1743892916,
"narHash": "sha256-RWvfosAHobUiGMhWIS915WF4TsrQYDXv1gJk59TLAdU=",
"owner": "danth",
"repo": "stylix",
"rev": "9bfc74f330ead111e8ea354b2220a431b0cfaa26",
"rev": "aebfec1998ebbc087de0104e4a4cec99ec1e3f7a",
"type": "github"
},
"original": {
@ -1533,11 +1517,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1740877430,
"narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
"lastModified": 1743296873,
"narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
"rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
"type": "github"
},
"original": {
@ -1570,14 +1554,17 @@
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": [
"nixcord",
"nixpkgs"
]
},
"locked": {
"lastModified": 1739829690,
"narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"lastModified": 1742370146,
"narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3d0579f5cc93436052d94b73925b48973a104204",
"rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
"type": "github"
},
"original": {
@ -1609,11 +1596,11 @@
},
"unstable": {
"locked": {
"lastModified": 1742288794,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"lastModified": 1743827369,
"narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"rev": "42a1c966be226125b48c384171c44c651c236c22",
"type": "github"
},
"original": {
@ -1637,11 +1624,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1742218199,
"narHash": "sha256-XOPhTEi797R331q6IKEnxeR6HbogjVbV5nmO7/l0ABk=",
"lastModified": 1742480467,
"narHash": "sha256-y4iRZ3bUpN8prKIbVQw++4yM4LtXLED7/D/9HJjGjJI=",
"owner": "wez",
"repo": "wezterm",
"rev": "7053748e4d899e7fc5e202d6f903b052fc78e759",
"rev": "a87358516004a652ad840bc1661bdf65ffc89b43",
"type": "github"
},
"original": {
@ -1671,11 +1658,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1742249030,
"narHash": "sha256-YZ+axsuNsgIKWfnRkt6Qa9UoKfUOIWf42vNUonXxmxM=",
"lastModified": 1743346993,
"narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "cca74a5f6b23742d77dc5db4312dfc40fd4a0fcc",
"rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -35,8 +35,6 @@
homes.modules = with inputs; [
agenix.homeManagerModules.default
stylix.homeManagerModules.stylix
niri-flake.homeModules.niri
nixcord.homeManagerModules.nixcord
];

6
modules/home/appearance/base/default.nix
View file

@ -23,8 +23,7 @@ in {
};
};
stylix =
{
stylix = {
iconTheme = {
package = pkgs.kora-icon-theme;
dark = "kora";
@ -32,8 +31,7 @@ in {
};
fonts.sizes.terminal = lib.mkIf (is-darwin system) 14;
}
// import "${inputs.self}/stylix.nix" {inherit pkgs;};
};
home.packages = with pkgs; [
kora-icon-theme

1
modules/home/programs/cli/default.nix
View file

@ -23,6 +23,7 @@ in {
git = enabled;
glow = enabled;
gpg = enabled;
httpie = enabled;
hyfetch = enabled;
journalctl = enabled;
jq = enabled;

16
modules/home/programs/cli/httpie/default.nix Normal file
View file

@ -0,0 +1,16 @@
{
lib,
config,
pkgs,
...
}: let
cfg = config.marleyos.programs.httpie;
in {
options.marleyos.programs.httpie.enable = lib.mkEnableOption "httpie";
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
httpie
];
};
}

3
modules/home/programs/tui/default.nix
View file

@ -14,9 +14,12 @@ in {
amfora = enabled;
btop = enabled;
cava = enabled;
jqp = enabled;
lazydocker = enabled;
lazygit = enabled;
ncmpcpp = enabled;
neovim = enabled;
superfile = enabled;
};
};
}

16
modules/home/programs/tui/jqp/default.nix Normal file
View file

@ -0,0 +1,16 @@
{
lib,
config,
pkgs,
...
}: let
cfg = config.marleyos.programs.jqp;
in {
options.marleyos.programs.jqp.enable = lib.mkEnableOption "jqp";
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
jqp
];
};
}

16
modules/home/programs/tui/lazydocker/default.nix Normal file
View file

@ -0,0 +1,16 @@
{
lib,
config,
pkgs,
...
}: let
cfg = config.marleyos.programs.lazydocker;
in {
options.marleyos.programs.lazydocker.enable = lib.mkEnableOption "lazydocker";
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
lazydocker
];
};
}

57
modules/home/programs/tui/superfile/config.toml Normal file
View file

@ -0,0 +1,57 @@
# More details are at https://superfile.netlify.app/configure/superfile-config/
#
# change your theme
# TODO: set this via stylix
theme = 'rose-pine'
#
# The editor files/directories will be opened with. (leave blank to use the EDITOR environment variable).
editor = ""
#
# Auto check for update
auto_check_update = false
#
# Cd on quit (For more details, please check out https://superfile.netlify.app/configure/superfile-config/#cd_on_quit)
cd_on_quit = false
#
# Whether to open file preview automatically every time superfile is opened.
default_open_file_preview = true
#
# The path of the first file panel when superfile is opened. (DON'T USE '~')
default_directory = "."
#
# Display file sizes using powers of 1000 (kB, MB, GB) instead of powers of 1024 (KiB, MiB, GiB).
file_size_use_si = false
#
# ================ Style =================
#
# If you don't have or don't want Nerdfont installed you can turn this off
nerdfont = true
#
# Set transparent background or not (this only work when your terminal background is transparent)
transparent_background = false
#
# File preview width allow '0' (this mean same as file panel),'x' x must be less than 10 and greater than 1 (This means that the width of the file preview will be one xth of the total width.)
file_preview_width = 0
#
# The length of the sidebar. If you don't want to display the sidebar, you can input 0 directly. If you want to display the value, please place it in the range of 3-20.
sidebar_width = 20
#
# Border style
border_top = '─'
border_bottom = '─'
border_left = '│'
border_right = '│'
border_top_left = '╭'
border_top_right = '╮'
border_bottom_left = '╰'
border_bottom_right = '╯'
border_middle_left = '├'
border_middle_right = '┤'
#
# ==========PLUGINS========== #
#
# Show more detailed metadata, please install exiftool before enabling this plugin!
metadata = false
#
# Enable MD5 checksum generation for files
enable_md5_checksum = false

18
modules/home/programs/tui/superfile/default.nix Normal file
View file

@ -0,0 +1,18 @@
{
lib,
config,
pkgs,
...
}: let
cfg = config.marleyos.programs.superfile;
in {
options.marleyos.programs.superfile.enable = lib.mkEnableOption "superfile";
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
superfile
];
xdg.configFile."superfile/config.toml".source = ./config.toml;
};
}

38
modules/nixos/appearance/base/default.nix
View file

@ -2,7 +2,6 @@
lib,
config,
pkgs,
inputs,
...
}: let
cfg = config.marleyos.appearance.base;
@ -10,7 +9,42 @@ in {
options.marleyos.appearance.base.enable = lib.mkEnableOption "base";
config = lib.mkIf cfg.enable {
stylix = import "${inputs.self}/stylix.nix" {inherit pkgs;};
stylix = {
enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
override = {slug = "rose-pine";};
image = ./wallpaper.png;
fonts = {
serif = {
package = pkgs.eb-garamond;
name = "EB Garamond";
};
sansSerif = {
package = pkgs.dm-sans;
name = "DeepMind Sans";
};
monospace = {
package = pkgs.maple-mono-NF;
name = "Maple Mono";
};
emoji = {
package = pkgs.whatsapp-emoji-font;
name = "Apple Color Emoji";
};
sizes = {
terminal = 11;
};
};
cursor = {
package = pkgs.rose-pine-cursor;
name = "BreezeX-RosePine-Linux";
};
};
fonts = {
enableDefaultPackages = true;

0
wallpaper.png → modules/nixos/appearance/base/wallpaper.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 MiB

After

Width:  |  Height:  |  Size: 4.7 MiB

36
stylix.nix
View file

@ -1,36 +0,0 @@
{pkgs}: {
enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
override = {slug = "rose-pine";};
image = ./wallpaper.png;
fonts = {
serif = {
package = pkgs.eb-garamond;
name = "EB Garamond";
};
sansSerif = {
package = pkgs.dm-sans;
name = "DeepMind Sans";
};
monospace = {
package = pkgs.maple-mono-NF;
name = "Maple Mono";
};
emoji = {
package = pkgs.whatsapp-emoji-font;
name = "Apple Color Emoji";
};
sizes = {
terminal = 11;
};
};
cursor = {
package = pkgs.rose-pine-cursor;
name = "BreezeX-RosePine-Linux";
};
}