youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2024-11-25 02:03:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: youwen5:37ba49d7a18bcd5e7170249427193995250f6998
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos
..
compare: youwen5:19bc2ec4689c9f913a574f698369b0d6f312f377
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos

No commits in common. "37ba49d7a18bcd5e7170249427193995250f6998" and "19bc2ec4689c9f913a574f698369b0d6f312f377" have entirely different histories.
37ba49d7a1 ... 19bc2ec468

6 changed files with 113 additions and 63 deletions
Show stats Expand all files Collapse all files

147
flake.lock
View file

@ -104,10 +104,26 @@
"type": "github" "type": "github"
} }
}, },
"bleedingpkgs": {
"locked": {
"lastModified": 1731295903,
"narHash": "sha256-9T4S/rndz6zD9suTtJMBnAbIDMb1Kkqi6IERvYngaTA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e635cf8d9fb548dd4190988696621180a3114601",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"blink-cmp": { "blink-cmp": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_3",
"nixpkgs": [ "nixpkgs": [
"viminal", "viminal",
"nixpkgs" "nixpkgs"
@ -253,9 +269,7 @@
}, },
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1730504689,
@ -273,7 +287,28 @@
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1727826117, "lastModified": 1727826117,
@ -289,27 +324,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": { "flake-parts_4": {
"inputs": { "inputs": {
"systems": "systems" "nixpkgs-lib": "nixpkgs-lib_3"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1730504689,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -325,9 +360,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
@ -343,9 +378,30 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": [
"stylix",
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -363,10 +419,7 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": [ "systems": "systems_5"
"stylix",
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -529,10 +582,8 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-parts": [ "flake-parts": "flake-parts_2",
"flake-parts" "flake-utils": "flake-utils",
],
"flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -570,7 +621,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": "lix",
"nixpkgs": [ "nixpkgs": [
@ -630,7 +681,7 @@
"nix-homebrew": { "nix-homebrew": {
"inputs": { "inputs": {
"brew-src": "brew-src", "brew-src": "brew-src",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nix-darwin": "nix-darwin_2", "nix-darwin": "nix-darwin_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -699,6 +750,18 @@
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": {
"lastModified": 1730504152,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
"nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1727825735, "lastModified": 1727825735,
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
@ -710,6 +773,18 @@
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
} }
}, },
"nixpkgs-lib_3": {
"locked": {
"lastModified": 1730504152,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710695816, "lastModified": 1710695816,
@ -837,8 +912,8 @@
"inputs": { "inputs": {
"apple-firmware": "apple-firmware", "apple-firmware": "apple-firmware",
"apple-silicon": "apple-silicon", "apple-silicon": "apple-silicon",
"bleedingpkgs": "bleedingpkgs",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"homebrew-cask": "homebrew-cask", "homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core", "homebrew-core": "homebrew-core",
@ -943,11 +1018,11 @@
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"systems": "systems_5", "systems": "systems_4",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
@ -1093,9 +1168,7 @@
}, },
"vesktop-bin": { "vesktop-bin": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_5",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1176,9 +1249,7 @@
}, },
"zen-browser-source": { "zen-browser-source": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": "flake-parts_4",
"flake-parts"
],
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {

14
flake.nix
View file

@ -4,7 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# bleedingpkgs.url = "github:nixos/nixpkgs/master"; bleedingpkgs.url = "github:nixos/nixpkgs/master";
# nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
home-manager = { home-manager = {
@ -12,13 +12,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-parts = {
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";
nix-darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin"; url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -42,7 +35,6 @@
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.1"; url = "github:nix-community/lanzaboote/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
}; };
lix-module = { lix-module = {
@ -50,6 +42,8 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-parts.url = "github:hercules-ci/flake-parts";
apple-silicon = { apple-silicon = {
# url = "github:tpwrules/nixos-apple-silicon"; # url = "github:tpwrules/nixos-apple-silicon";
url = "github:zzywysm/nixos-asahi"; url = "github:zzywysm/nixos-asahi";
@ -74,7 +68,6 @@
vesktop-bin = { vesktop-bin = {
url = "github:youwen5/vesktop-bin-flake"; url = "github:youwen5/vesktop-bin-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
}; };
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
@ -95,7 +88,6 @@
}; };
zen-browser-source.url = "github:youwen5/zen-browser-source-flake"; zen-browser-source.url = "github:youwen5/zen-browser-source-flake";
zen-browser-source.inputs.flake-parts.follows = "flake-parts";
}; };
outputs = outputs =

1
hosts/adrastea/default.nix
View file

@ -17,7 +17,6 @@
../../modules/linux/audio-prod ../../modules/linux/audio-prod
../../modules/linux/wine ../../modules/linux/wine
../../modules/linux/stylix ../../modules/linux/stylix
../../modules/linux/distrobox
../../overlays ../../overlays
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

9
modules/linux/distrobox/default.nix
View file

@ -1,9 +0,0 @@
{ pkgs, ... }:
{
virtualisation.podman = {
enable = true;
dockerCompat = true;
};
environment.systemPackages = [ pkgs.distrobox ];
}

4
modules/linux/greeter/default.nix
View file

@ -4,9 +4,7 @@
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = '' command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --remember --greeting 'Welcome to liminalOS. Access is restricted to authorized personnel only.'";
${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --remember --greeting "Welcome to liminalOS. This is system generation $(readlink /nix/var/nix/profiles/system | grep -o '[0-9]*'). Access is restricted to authorized personnel only."
'';
user = "greeter"; user = "greeter";
}; };
}; };

1
users/youwen/linux/programs/default.nix
View file

@ -17,7 +17,6 @@
scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "''; scrollback_pager = ''nvim --noplugin -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "'';
cursor = pkgs.lib.mkForce "#c0caf5"; cursor = pkgs.lib.mkForce "#c0caf5";
cursor_text_color = pkgs.lib.mkForce "#1a1b26"; cursor_text_color = pkgs.lib.mkForce "#1a1b26";
cursor_trail = 3;
}; };
keybindings = { keybindings = {
"kitty_mod+h" = "show_scrollback"; "kitty_mod+h" = "show_scrollback";